From e68336e1e30e16da026f7673a88ca905ca93e79f Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Mon, 10 Sep 2012 15:30:04 +0300
Subject: [PATCH] Resizing of items fixed for all resizers instead of bottom
 right resizer.

---
 src/domain/UBGraphicsDelegateFrame.cpp | 103 +++++++++++++++++--------
 src/domain/UBGraphicsDelegateFrame.h   |   1 +
 2 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp
index 5c6284be..8c8e5dcb 100644
--- a/src/domain/UBGraphicsDelegateFrame.cpp
+++ b/src/domain/UBGraphicsDelegateFrame.cpp
@@ -286,6 +286,52 @@ bool UBGraphicsDelegateFrame::canResizeBottomRight(qreal width, qreal height, qr
     return res;
 }
 
+QPointF UBGraphicsDelegateFrame::getFixedPointFromPos()
+{
+    QPointF fixedPoint;
+    if (!moving() && !rotating())
+    {
+        if (resizingTop())    
+        {
+            if (mMirrorX && mMirrorY)
+            {
+                if ((0 < mAngle) && (mAngle < 90))
+                    fixedPoint = delegated()->sceneBoundingRect().topLeft();                        
+                else
+                    fixedPoint = delegated()->sceneBoundingRect().topRight();
+            }
+            else
+            {
+                if ((0 < mAngle) && (mAngle <= 90))
+                    fixedPoint = delegated()->sceneBoundingRect().bottomRight();
+                else
+                    fixedPoint = delegated()->sceneBoundingRect().bottomLeft();
+            }
+        }
+        else if (resizingLeft())  
+        {
+            if (mMirrorX && mMirrorY)
+            {
+                if ((0 < mAngle) && (mAngle < 90))
+                    fixedPoint = delegated()->sceneBoundingRect().bottomLeft();                        
+                else
+                    fixedPoint = delegated()->sceneBoundingRect().topLeft();
+            }
+            else
+            {
+                if ((0 < mAngle) && (mAngle <= 90))
+                    fixedPoint = delegated()->sceneBoundingRect().topRight();
+                else
+                    fixedPoint = delegated()->sceneBoundingRect().bottomRight();
+            }
+        }
+        else if (resizingBottomRight())
+        {
+        }
+    }
+    return fixedPoint;
+}
+
 void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if (None == mCurrentTool)
@@ -461,7 +507,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
             mTranslateY += mInitialTransform.map(delegated()->boundingRect().topLeft()).y() - tr.map(delegated()->boundingRect().topLeft()).y();         
         }
     }
-    else if (mOperationMode == Scaling && (resizingTop() || resizingLeft()))
+    else if (resizingTop() || resizingLeft())
     {
         QPointF bottomRight = tr.map(delegated()->boundingRect().bottomRight());
         QPointF fixedPoint = mInitialTransform.map(delegated()->boundingRect().bottomRight());
@@ -478,61 +524,52 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     else if (mOperationMode == Resizing)
     {
         QSizeF originalSize = delegated()->boundingRect().size(); 
-      //  QSizeF originalSize = delegated()->sceneBoundingRect().size(); // 
 
         mScaleX = 1;
         mScaleY = 1;
 
-        tr = buildTransform().translate(moveX, moveY);
-        if (resizingRight() || resizingBottom() || resizingBottomRight() || resizingTop() || resizingLeft())
+        if (!moving() && !rotating())
         {
+            qreal dPosX = 0;
+            qreal dPosY = 0;
 
+            QPointF fixedPoint = getFixedPointFromPos();
 
-            qreal dPosX;
-            qreal dPosY;
-
-            if (resizingTop() || resizingLeft())
+            if (resizingTop())    
             {
-                dPosX = mMirrorX ? moveX : -moveX;
-                dPosY = mMirrorY ? moveY : -moveY;
+                if (mMirrorX && mMirrorY)
+                    dPosY = moveY;
+                else
+                    dPosY = -moveY;
+            }
+            else if (resizingLeft())  
+            {
+                if (mMirrorX && mMirrorY)
+                    dPosX = moveX;
+                else
+                    dPosX = -moveX;
             }
             else if (resizingBottomRight())
             {
                 dPosX = moveX;
                 dPosY = moveY;
             }
-            else
-            {
-                dPosX = mMirrorX ? -moveX :moveX;
+            else if (resizingRight())
+                dPosX = (mMirrorX) ?  -moveX : moveX;
+            else if (resizingBottom())               
                 dPosY = mMirrorY ? -moveY : moveY;
-            }
-
-
-            QPointF oldPos;
-            if (mMirrorX)
-                oldPos = delegated()->sceneBoundingRect().topLeft();
-            else
-                oldPos = delegated()->sceneBoundingRect().bottomRight();
-
-            delegated()->setTransform(tr); 
 
             UBResizableGraphicsItem* resizableItem = dynamic_cast<UBResizableGraphicsItem*>(delegated());
             if (resizableItem)
             {
-
                 resizableItem->resize(originalSize.width() + dPosX, originalSize.height() + dPosY);
-                if (resizingTop() || resizingLeft() || (mMirrorX && resizingBottomRight()))
+                if (resizingTop() || resizingLeft() || ((mMirrorX || mMirrorY) && resizingBottomRight()))
                 {
-                    QPointF newPos;
-
-                    if (mMirrorX)
-                        newPos = delegated()->sceneBoundingRect().topLeft();
-                    else
-                        newPos = delegated()->sceneBoundingRect().bottomRight();
-
-                    delegated()->setPos(delegated()->pos()-newPos+oldPos);
+                    QPointF newFixedPoint = getFixedPointFromPos();;
 
+                    delegated()->setPos(delegated()->pos()-newFixedPoint+fixedPoint);
                 }
+
             }
         }
     }
diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h
index 142766fe..34aacda3 100644
--- a/src/domain/UBGraphicsDelegateFrame.h
+++ b/src/domain/UBGraphicsDelegateFrame.h
@@ -37,6 +37,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject
         QPainterPath shape() const;
 
         virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
+        QPointF getFixedPointFromPos();
         virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
         virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);