[needs-docs] Use alt modifier to reverse zoom behaviour

nyalldawson · nyalldawson · commit ea2ff06c7978 · 2017-01-23T17:09:23.000+10:00
Previously shift-modifier was used to change zoom in to out, and
zoom out to in. This commit changes it to the more common alt
modifier.
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -290,7 +290,7 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
 
     case Zoom:
     {
-      if ( !( e->modifiers() & Qt::ShiftModifier ) )
+      if ( !( e->modifiers() & Qt::AltModifier ) )
       {
         //zoom in action
         startMarqueeZoom( scenePoint );
@@ -1706,7 +1706,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
     {
       //both control and space pressed
       //set cursor to zoom in/out depending on shift key status
-      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );
+      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );
       QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );
       viewport()->setCursor( zoomCursor );
     }
@@ -1740,8 +1740,8 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
       mTemporaryZoomStatus = QgsComposerView::Active;
       mPreviousTool = mCurrentTool;
       setCurrentTool( Zoom );
-      //set cursor to zoom in/out depending on shift key status
-      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );
+      //set cursor to zoom in/out depending on alt key status
+      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );
       QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );
       viewport()->setCursor( zoomCursor );
       return;
@@ -1750,10 +1750,10 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
 
   if ( mCurrentTool == QgsComposerView::Zoom )
   {
-    //using the zoom tool, respond to changes in shift key status and update mouse cursor accordingly
+    //using the zoom tool, respond to changes in alt key status and update mouse cursor accordingly
     if ( ! e->isAutoRepeat() )
     {
-      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );
+      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );
       QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );
       viewport()->setCursor( zoomCursor );
     }
@@ -1939,10 +1939,10 @@ void QgsComposerView::keyReleaseEvent( QKeyEvent * e )
   }
   else if ( mCurrentTool == QgsComposerView::Zoom )
   {
-    //if zoom tool is active, respond to changes in the shift key status and update cursor accordingly
+    //if zoom tool is active, respond to changes in the alt key status and update cursor accordingly
     if ( ! e->isAutoRepeat() )
     {
-      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );
+      QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );
       QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );
       viewport()->setCursor( zoomCursor );
     }
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
@@ -84,7 +84,7 @@ void QgsMapToolZoom::canvasReleaseEvent( QgsMapMouseEvent* e )
     return;
 
   bool zoomOut = mZoomOut;
-  if ( e->modifiers() & Qt::ShiftModifier )
+  if ( e->modifiers() & Qt::AltModifier )
     zoomOut = !zoomOut;
 
   // We are not really dragging in this case. This is sometimes caused by

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )`
`290`	`290`
`291`	`291`	`case Zoom:`
`292`	`292`	`{`
`293`		`- if ( !( e->modifiers() & Qt::ShiftModifier ) )`
	`293`	`+ if ( !( e->modifiers() & Qt::AltModifier ) )`
`294`	`294`	`{`
`295`	`295`	`//zoom in action`
`296`	`296`	`startMarqueeZoom( scenePoint );`
`@@ -1706,7 +1706,7 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )`
`1706`	`1706`	`{`
`1707`	`1707`	`//both control and space pressed`
`1708`	`1708`	`//set cursor to zoom in/out depending on shift key status`
`1709`		`- QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );`
	`1709`	`+ QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );`
`1710`	`1710`	`QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );`
`1711`	`1711`	`viewport()->setCursor( zoomCursor );`
`1712`	`1712`	`}`
`@@ -1740,8 +1740,8 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )`
`1740`	`1740`	`mTemporaryZoomStatus = QgsComposerView::Active;`
`1741`	`1741`	`mPreviousTool = mCurrentTool;`
`1742`	`1742`	`setCurrentTool( Zoom );`
`1743`		`- //set cursor to zoom in/out depending on shift key status`
`1744`		`- QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );`
	`1743`	`+ //set cursor to zoom in/out depending on alt key status`
	`1744`	`+ QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );`
`1745`	`1745`	`QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );`
`1746`	`1746`	`viewport()->setCursor( zoomCursor );`
`1747`	`1747`	`return;`
`@@ -1750,10 +1750,10 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )`
`1750`	`1750`
`1751`	`1751`	`if ( mCurrentTool == QgsComposerView::Zoom )`
`1752`	`1752`	`{`
`1753`		`- //using the zoom tool, respond to changes in shift key status and update mouse cursor accordingly`
	`1753`	`+ //using the zoom tool, respond to changes in alt key status and update mouse cursor accordingly`
`1754`	`1754`	`if ( ! e->isAutoRepeat() )`
`1755`	`1755`	`{`
`1756`		`- QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );`
	`1756`	`+ QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );`
`1757`	`1757`	`QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );`
`1758`	`1758`	`viewport()->setCursor( zoomCursor );`
`1759`	`1759`	`}`
`@@ -1939,10 +1939,10 @@ void QgsComposerView::keyReleaseEvent( QKeyEvent * e )`
`1939`	`1939`	`}`
`1940`	`1940`	`else if ( mCurrentTool == QgsComposerView::Zoom )`
`1941`	`1941`	`{`
`1942`		`- //if zoom tool is active, respond to changes in the shift key status and update cursor accordingly`
	`1942`	`+ //if zoom tool is active, respond to changes in the alt key status and update cursor accordingly`
`1943`	`1943`	`if ( ! e->isAutoRepeat() )`
`1944`	`1944`	`{`
`1945`		`- QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::ShiftModifier ) ? zoom_out : zoom_in ) );`
	`1945`	`+ QPixmap myZoomQPixmap = QPixmap(( const char ** )(( e->modifiers() & Qt::AltModifier ) ? zoom_out : zoom_in ) );`
`1946`	`1946`	`QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );`
`1947`	`1947`	`viewport()->setCursor( zoomCursor );`
`1948`	`1948`	`}`