Skip to content
Permalink
Browse files
Ensure Composer set to zoomFull() when shown from menu or manager
- Zoom full happens on initial showing or showing after hiding, via user close or spontaneously by os
- If Composer is open, behind other windows or minimized, zoom state is maintained
  • Loading branch information
dakcarto committed Dec 11, 2012
1 parent 9461431 commit 489a9d54cfc3fec9366458d874f4b5925f2cdbe9
Showing with 10 additions and 0 deletions.
  1. +5 −0 src/app/composer/qgscomposer.cpp
  2. +5 −0 src/app/composer/qgscomposermanager.cpp
@@ -445,10 +445,15 @@ void QgsComposer::open( void )

void QgsComposer::activate()
{
bool shown = isVisible();
show();
raise();
setWindowState( windowState() & ~Qt::WindowMinimized );
activateWindow();
if ( !shown )
{
on_mActionZoomAll_triggered();
}
}

#ifdef Q_WS_MAC
@@ -172,11 +172,16 @@ void QgsComposerManager::show_clicked()
c = it.value();
if ( c )
{
bool shown = isVisible();
c->show();
c->activate();
c->stackUnder( this );
raise();
activateWindow();
if ( !shown )
{
c->on_mActionZoomAll_triggered();
}
}
}
}

0 comments on commit 489a9d5

Please sign in to comment.