Fixed bug 826.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7643 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 23, 2007 · fd1a41a · fd1a41a
1 parent 66d22b1
commit fd1a41a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -128,9 +128,15 @@ void QgsComposer::open ( void )
   if ( mFirstTime ) {
     mComposition->createDefault();
     mFirstTime = false;
+    show();
+    zoomFull(); // zoomFull() does not work properly until we have called show()
   }
 
-  show();
+  else{
+    show(); //make sure the window is displayed - with a saved project, it's possible to not have already called show()
+            //is that a bug?
+    raise(); //bring the composer window to the front
+  }
 }
 
 void QgsComposer::removeWidgetChildren ( QWidget *w )

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3103,7 +3103,6 @@ myQPainter.end();
 void QgisApp::filePrint()
 {
   mComposer->open();
-  mComposer->zoomFull();
 }
 
 void QgisApp::saveMapAsImage()