restore zoom out rect

qgis · Oct 20, 2018 · f17b1a5 · f17b1a5
1 parent 5fd6f68
commit f17b1a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/python/gui/auto_generated/qgsmaptoolzoom.sip.in b/python/gui/auto_generated/qgsmaptoolzoom.sip.in
@@ -47,10 +47,6 @@ constructor
 
 
 
-    void updateCursor();
-%Docstring
-Flag to indicate a map canvas drag operation is taking place
-%End
 };
 
 /************************************************************************

diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
@@ -65,15 +65,8 @@ void QgsMapToolZoom::canvasMoveEvent( QgsMapMouseEvent *e )
   mZoomRect.setBottomRight( e->pos() );
   if ( mRubberBand )
   {
-    if ( mZoomOut )
-    {
-      mRubberBand->hide();
-    }
-    else
-    {
-      mRubberBand->setToCanvasRectangle( mZoomRect );
-      mRubberBand->show();
-    }
+    mRubberBand->setToCanvasRectangle( mZoomRect );
+    mRubberBand->show();
   }
 }
 
@@ -96,7 +89,7 @@ void QgsMapToolZoom::canvasReleaseEvent( QgsMapMouseEvent *e )
   // a pen based computer reporting a press, move, and release, all the
   // one point.
   bool tooShort = ( mZoomRect.topLeft() - mZoomRect.bottomRight() ).manhattanLength() < mMinPixelZoom;
-  if ( !mDragging || tooShort || mZoomOut )
+  if ( !mDragging || tooShort )
   {
     mDragging = false;
     delete mRubberBand;

diff --git a/src/gui/qgsmaptoolzoom.h b/src/gui/qgsmaptoolzoom.h
@@ -63,6 +63,7 @@ class GUI_EXPORT QgsMapToolZoom : public QgsMapTool
     QCursor mZoomOutCursor;
     QCursor mZoomInCursor;
 
+  private:
     void updateCursor();
 };