[composer] Switch to alt key for resize and draw from center mode

nyalldawson · nyalldawson · commit c2f74c25fd09 · 2014-07-27T12:08:39.000+10:00
diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp
@@ -558,28 +558,19 @@ void QgsComposerMouseHandles::setViewportCursor( Qt::CursorShape cursor )
 
 void QgsComposerMouseHandles::mouseMoveEvent( QGraphicsSceneMouseEvent* event )
 {
-  bool shiftModifier = false;
-  bool controlModifier = false;
-  if ( event->modifiers() & Qt::ShiftModifier )
-  {
-    //shift key depressed
-    shiftModifier = true;
-  }
-  if ( event->modifiers() & Qt::ControlModifier )
-  {
-    //shift key depressed
-    controlModifier = true;
-  }
-
   if ( mIsDragging )
   {
     //currently dragging a selection
-    dragMouseMove( event->lastScenePos(), shiftModifier, controlModifier );
+    //if shift depressed, constrain movement to horizontal/vertical
+    //if control depressed, ignore snapping
+    dragMouseMove( event->lastScenePos(), event->modifiers() & Qt::ShiftModifier, event->modifiers() & Qt::ControlModifier );
   }
   else if ( mIsResizing )
   {
     //currently resizing a selection
-    resizeMouseMove( event->lastScenePos(), shiftModifier, controlModifier );
+    //lock aspect ratio if shift depressed
+    //resize from center if alt depressed
+    resizeMouseMove( event->lastScenePos(), event->modifiers() & Qt::ShiftModifier, event->modifiers() & Qt::AltModifier );
   }
 
   mLastMouseEventPos = event->lastScenePos();
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -928,16 +928,16 @@ void QgsComposerView::mouseMoveEvent( QMouseEvent* e )
   }
 
   bool shiftModifier = false;
-  bool controlModifier = false;
+  bool altModifier = false;
   if ( e->modifiers() & Qt::ShiftModifier )
   {
     //shift key depressed
     shiftModifier = true;
   }
-  if ( e->modifiers() & Qt::ControlModifier )
+  if ( e->modifiers() & Qt::AltModifier )
   {
-    //control key depressed
-    controlModifier = true;
+    //alt key depressed
+    altModifier = true;
   }
 
   mMouseCurrentXY = e->pos();
@@ -1002,7 +1002,7 @@ void QgsComposerView::mouseMoveEvent( QMouseEvent* e )
       case AddTable:
         //adjust rubber band item
       {
-        updateRubberBandRect( scenePoint, shiftModifier, controlModifier );
+        updateRubberBandRect( scenePoint, shiftModifier, altModifier );
         break;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -928,16 +928,16 @@ void QgsComposerView::mouseMoveEvent( QMouseEvent* e )`
`928`	`928`	`}`
`929`	`929`
`930`	`930`	`bool shiftModifier = false;`
`931`		`- bool controlModifier = false;`
	`931`	`+ bool altModifier = false;`
`932`	`932`	`if ( e->modifiers() & Qt::ShiftModifier )`
`933`	`933`	`{`
`934`	`934`	`//shift key depressed`
`935`	`935`	`shiftModifier = true;`
`936`	`936`	`}`
`937`		`- if ( e->modifiers() & Qt::ControlModifier )`
	`937`	`+ if ( e->modifiers() & Qt::AltModifier )`
`938`	`938`	`{`
`939`		`- //control key depressed`
`940`		`- controlModifier = true;`
	`939`	`+ //alt key depressed`
	`940`	`+ altModifier = true;`
`941`	`941`	`}`
`942`	`942`
`943`	`943`	`mMouseCurrentXY = e->pos();`
`@@ -1002,7 +1002,7 @@ void QgsComposerView::mouseMoveEvent( QMouseEvent* e )`
`1002`	`1002`	`case AddTable:`
`1003`	`1003`	`//adjust rubber band item`
`1004`	`1004`	`{`
`1005`		`- updateRubberBandRect( scenePoint, shiftModifier, controlModifier );`
	`1005`	`+ updateRubberBandRect( scenePoint, shiftModifier, altModifier );`
`1006`	`1006`	`break;`
`1007`	`1007`	`}`
`1008`	`1008`