Revert "Don't resize canvas size on widget change"

Revert this change for now as it has larger impacts then I thought it would. Will improve and bring back next release. This reverts commit ef51b70.
qgis · Jun 16, 2016 · 5458d64 · 5458d64 · nirvn · Jun 16, 2016
1 parent f9ff5e2
commit 5458d64
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1480,11 +1480,13 @@ void QgsMapCanvas::mouseReleaseEvent( QMouseEvent* e )
 
 } // mouseReleaseEvent
 
-void QgsMapCanvas::updateMapSize()
+void QgsMapCanvas::resizeEvent( QResizeEvent * e )
 {
+  QGraphicsView::resizeEvent( e );
   mResizeTimer->start( 500 );
 
   QSize lastSize = viewport()->size();
+
   mSettings.setOutputSize( lastSize );
   mMapRenderer->setOutputSize( lastSize, mSettings.outputDpi() );
 
@@ -1502,28 +1504,12 @@ void QgsMapCanvas::updateMapSize()
   emit extentsChanged();
 }
 
-
-void QgsMapCanvas::resizeEvent( QResizeEvent * e )
-{
-  QGraphicsView::resizeEvent( e );
-
-  QSize size = viewport()->size();
-  if ( size.width() > mSettings.outputSize().width() || size.height() > mSettings.outputSize().height() )
-  {
-    updateMapSize();
-  }
-  else
-  {
-    moveCanvasContents( true );
-  }
-}
-
 void QgsMapCanvas::paintEvent( QPaintEvent *e )
 {
   // no custom event handling anymore
 
   QGraphicsView::paintEvent( e );
-}
+} // paintEvent
 
 void QgsMapCanvas::updateCanvasItemPositions()
 {