[composer] Make zoom full action actually zoom to all items, not just page bounds

nyalldawson · nyalldawson · commit 020eb606a2f6 · 2014-02-13T22:38:22.000+11:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -957,14 +957,7 @@ void QgsComposer::zoomFull( void )
 {
   if ( mView )
   {
-    int nPages = mComposition->numPages();
-    if ( nPages < 1 )
-    {
-      return;
-    }
-    double height = mComposition->paperHeight() * nPages + mComposition->spaceBetweenPages() * ( nPages - 1 );
-    mView->fitInView( 0, 0, mComposition->paperWidth() + 1, height + 1, Qt::KeepAspectRatio );
-    mView->centerOn(( mComposition->paperWidth() + 1 ) / 2, ( height + 1 ) / 2 );
+    mView->fitInView( mComposition->sceneRect(), Qt::KeepAspectRatio );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -957,14 +957,7 @@ void QgsComposer::zoomFull( void )`
`957`	`957`	`{`
`958`	`958`	`if ( mView )`
`959`	`959`	`{`
`960`		`- int nPages = mComposition->numPages();`
`961`		`- if ( nPages < 1 )`
`962`		`- {`
`963`		`- return;`
`964`		`- }`
`965`		`- double height = mComposition->paperHeight() * nPages + mComposition->spaceBetweenPages() * ( nPages - 1 );`
`966`		`- mView->fitInView( 0, 0, mComposition->paperWidth() + 1, height + 1, Qt::KeepAspectRatio );`
`967`		`- mView->centerOn(( mComposition->paperWidth() + 1 ) / 2, ( height + 1 ) / 2 );`
	`960`	`+ mView->fitInView( mComposition->sceneRect(), Qt::KeepAspectRatio );`
`968`	`961`	`}`
`969`	`962`	`}`
`970`	`963`