Don't zoom with mouse wheel if keyboard modifiers pressed

qgis · Mar 30, 2013 · 8299001 · 8299001
1 parent 50c3303
commit 8299001
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -37,6 +37,7 @@ email                : sherman at mrcc.com
 #include <QWheelEvent>
 
 #include "qgis.h"
+#include "qgsapplication.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
 #include "qgsmapcanvasmap.h"
@@ -1093,6 +1094,12 @@ void QgsMapCanvas::wheelEvent( QWheelEvent *e )
     return;
   }
 
+  if ( QgsApplication::keyboardModifiers() )
+  {
+    // leave the wheel for map tools if any modifier pressed
+    return;
+  }
+
   switch ( mWheelAction )
   {
     case WheelZoom: