Merge branch 'bugfixes' of github.com:pencil2d/pencil

pencil2d · Jun 18, 2019 · b1e6171 · b1e6171
2 parents e4f722a + d1d2921
commit b1e6171
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/core_lib/src/interface/scribblearea.cpp b/core_lib/src/interface/scribblearea.cpp
@@ -1508,7 +1508,7 @@ QPointF ScribbleArea::whichAnchorPoint(QPointF anchorPoint)
     return anchorPoint;
 }
 
-void ScribbleArea::adjustSelection(float offsetX, float offsetY, qreal rotatedAngle)
+void ScribbleArea::adjustSelection(float offsetX, float offsetY, qreal rotationOffset)
 {
     QRectF& transformedSelection = myTransformedSelection;
 
@@ -1552,8 +1552,10 @@ void ScribbleArea::adjustSelection(float offsetX, float offsetY, qreal rotatedAn
     {
         myTempTransformedSelection =
             transformedSelection; // @ necessary?
-        myRotatedAngle = (currentTool()->getCurrentPixel().x() -
-                          currentTool()->getLastPressPixel().x()) + rotatedAngle;
+        QPointF curPoint = currentTool()->getCurrentPoint();
+        QPointF anchorPoint = transformedSelection.center();
+        myRotatedAngle = ( atan2( curPoint.y() - anchorPoint.y(), curPoint.x() - anchorPoint.x() ) ) * 180.0 / M_PI - rotationOffset;
+        qDebug() << curPoint << anchorPoint << myRotatedAngle << rotationOffset;
         break;
     }
     default:

diff --git a/core_lib/src/interface/scribblearea.h b/core_lib/src/interface/scribblearea.h
@@ -67,7 +67,7 @@ class ScribbleArea : public QWidget
 
     void deleteSelection();
     void setSelection(QRectF rect);
-    void adjustSelection(float offsetX, float offsetY, qreal rotatedAngle);
+    void adjustSelection(float offsetX, float offsetY, qreal rotationOffset);
     void applySelectionChanges();
     void displaySelectionProperties();
     void resetSelectionProperties();
@@ -86,6 +86,7 @@ class ScribbleArea : public QWidget
     QRectF myTransformedSelection;
     QRectF myTempTransformedSelection;
     qreal myRotatedAngle = 0.0;
+    qreal mRotationOffset = 0.0;
     QList<int> mClosestCurves;
 
     bool isLayerPaintable() const;

diff --git a/core_lib/src/tool/movetool.cpp b/core_lib/src/tool/movetool.cpp
@@ -150,7 +150,6 @@ void MoveTool::beginInteraction(Qt::KeyboardModifiers keyMod, Layer* layer)
     }
 
     mScribbleArea->findMoveModeOfCornerInRange();
-    mScribbleArea->myRotatedAngle = mRotatedAngle;
 
     if (keyMod != Qt::ShiftModifier)
     {
@@ -173,6 +172,12 @@ void MoveTool::beginInteraction(Qt::KeyboardModifiers keyMod, Layer* layer)
     {
         createVectorSelection(keyMod, layer);
     }
+
+    if(mScribbleArea->getMoveMode() == MoveMode::ROTATION) {
+        QPointF curPoint = getCurrentPoint();
+        QPointF anchorPoint = selectionRect.center();
+        mRotatedAngle = ( atan2( curPoint.y() - anchorPoint.y(), curPoint.x() - anchorPoint.x() ) ) * 180.0 / M_PI;
+    }
 }
 
 bool MoveTool::shouldDeselect()