Fix for jumps if moving diagrams and labels with rotation point other…

… than lower left git-svn-id: http://svn.osgeo.org/qgis/trunk@15683 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 8, 2011 · 8d364cb · 8d364cb
1 parent 9007d89
commit 8d364cb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp
@@ -49,8 +49,14 @@ void QgsMapToolMoveLabel::canvasPressEvent( QMouseEvent * e )
   if ( labelMoveable( layer, xCol, yCol ) || diagramMoveable( layer, xCol, yCol ) )
   {
     mStartPointMapCoords = toMapCoordinates( e->pos() );
-    mClickOffsetX = mStartPointMapCoords.x() - mCurrentLabelPos.labelRect.xMinimum();
-    mClickOffsetY = mStartPointMapCoords.y() - mCurrentLabelPos.labelRect.yMinimum();
+    QgsPoint referencePoint;
+    if ( !rotationPoint( referencePoint ) )
+    {
+      referencePoint.setX( mCurrentLabelPos.labelRect.xMinimum() );
+      referencePoint.setY( mCurrentLabelPos.labelRect.yMinimum() );
+    }
+    mClickOffsetX = mStartPointMapCoords.x() - referencePoint.x();
+    mClickOffsetY = mStartPointMapCoords.y() - referencePoint.y();
     createRubberBands();
   }
 }