From 489a9d54cfc3fec9366458d874f4b5925f2cdbe9 Mon Sep 17 00:00:00 2001
From: Larry Shaffer <larrys@dakotacarto.com>
Date: Mon, 10 Dec 2012 19:15:47 -0700
Subject: [PATCH] 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
---
 src/app/composer/qgscomposer.cpp        | 5 +++++
 src/app/composer/qgscomposermanager.cpp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 3f1e9c1b24f1..f32e7ddd16c7 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.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
diff --git a/src/app/composer/qgscomposermanager.cpp b/src/app/composer/qgscomposermanager.cpp
index bcf4045cb85f..e65279bbf6b9 100644
--- a/src/app/composer/qgscomposermanager.cpp
+++ b/src/app/composer/qgscomposermanager.cpp
@@ -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();
+        }
       }
     }
   }