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

qgis · Jul 27, 2014 · c2f74c2 · c2f74c2
1 parent 94919a1
commit c2f74c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
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;
       }