Fixed bug 826.

StevenB · StevenB · commit fd1a41a25968 · 2007-11-23T04:27:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7643 c8812cc2-4d05-0410-92ff-de0c093fc19c
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()

Original file line number	Diff line number	Diff line change
`@@ -3103,7 +3103,6 @@ myQPainter.end();`
`3103`	`3103`	`void QgisApp::filePrint()`
`3104`	`3104`	`{`
`3105`	`3105`	`mComposer->open();`
`3106`		`- mComposer->zoomFull();`
`3107`	`3106`	`}`
`3108`	`3107`
`3109`	`3108`	`void QgisApp::saveMapAsImage()`