Merge pull request #8345 from m-kuhn/snapToGridExtentsUpdate

m-kuhn · web-flow · commit 03c38e92f885 · 2018-10-26T12:58:49.000+02:00
Update snap to grid rect on extentChange
diff --git a/src/gui/qgssnaptogridcanvasitem.cpp b/src/gui/qgssnaptogridcanvasitem.cpp
@@ -31,8 +31,6 @@ void QgsSnapToGridCanvasItem::paint( QPainter *painter )
 
   painter->save();
   QgsRectangle mapRect = mMapCanvas->extent();
-  if ( rect() != mapRect )
-    setRect( mapRect );
 
   painter->setRenderHints( QPainter::Antialiasing );
   painter->setCompositionMode( QPainter::CompositionMode_Difference );
@@ -145,6 +143,10 @@ void QgsSnapToGridCanvasItem::updateZoomFactor()
   {
     const int threshold = 5;
 
+    const QgsRectangle extent = mMapCanvas->extent();
+    if ( extent != rect() )
+      setRect( extent );
+
     const QgsPointXY centerPoint = mMapCanvas->extent().center();
     const QPointF canvasCenter = toCanvasCoordinates( centerPoint );
 
