]> git.sesse.net Git - kdenlive/blobdiff - src/graphicsscenerectmove.cpp
make the titler respect rectangles transformations when resizing or aligning:
[kdenlive] / src / graphicsscenerectmove.cpp
index 78e7e8548d8f8a27c4fb2930cf71c177e4ac2cd4..c5fb33390674c64817cb55ee00bd621c53558a11 100644 (file)
 #include <QTextBlock>
 
 
-GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent): QGraphicsScene(parent), m_selectedItem(NULL), resizeMode(NoResize), m_tool(TITLE_RECTANGLE) {
+GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent) :
+        QGraphicsScene(parent),
+        m_selectedItem(NULL),
+        m_resizeMode(NoResize),
+        m_tool(TITLE_RECTANGLE)
+{
     //grabMouse();
-    zoom = 1.0;
+    m_zoom = 1.0;
     setBackgroundBrush(QBrush(Qt::transparent));
 }
 
-void GraphicsSceneRectMove::setSelectedItem(QGraphicsItem *item) {
+void GraphicsSceneRectMove::setSelectedItem(QGraphicsItem *item)
+{
     clearSelection();
     m_selectedItem = item;
     item->setSelected(true);
     update();
 }
 
-TITLETOOL GraphicsSceneRectMove::tool() {
+TITLETOOL GraphicsSceneRectMove::tool()
+{
     return m_tool;
 }
 
-void GraphicsSceneRectMove::setTool(TITLETOOL tool) {
+void GraphicsSceneRectMove::setTool(TITLETOOL tool)
+{
     m_tool = tool;
     switch (m_tool) {
     case TITLE_RECTANGLE:
@@ -65,7 +73,8 @@ void GraphicsSceneRectMove::setTool(TITLETOOL tool) {
 }
 
 //virtual
-void GraphicsSceneRectMove::keyPressEvent(QKeyEvent * keyEvent) {
+void GraphicsSceneRectMove::keyPressEvent(QKeyEvent * keyEvent)
+{
     if (m_selectedItem == NULL) {
         QGraphicsScene::keyPressEvent(keyEvent);
         return;
@@ -109,10 +118,11 @@ void GraphicsSceneRectMove::keyPressEvent(QKeyEvent * keyEvent) {
 }
 
 //virtual
-void GraphicsSceneRectMove::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* e) {
+void GraphicsSceneRectMove::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* e)
+{
     QPointF p = e->scenePos();
     p += QPoint(-2, -2);
-    resizeMode = NoResize;
+    m_resizeMode = NoResize;
     m_selectedItem = NULL;
     QGraphicsItem* g = items(QRectF(p , QSizeF(4, 4)).toRect()).at(0);
     if (g) {
@@ -120,22 +130,24 @@ void GraphicsSceneRectMove::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* e) {
             QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(g);
             m_selectedItem = g;
             t->setTextInteractionFlags(Qt::TextEditorInteraction);
-        }
+        } else emit doubleClickEvent();
     }
     QGraphicsScene::mouseDoubleClickEvent(e);
 }
 
-void GraphicsSceneRectMove::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
+void GraphicsSceneRectMove::mouseReleaseEvent(QGraphicsSceneMouseEvent *e)
+{
     if (m_tool == TITLE_RECTANGLE && m_selectedItem) setSelectedItem(m_selectedItem);
     QGraphicsScene::mouseReleaseEvent(e);
     emit actionFinished();
 }
 
-void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e) {
+void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e)
+{
     m_clickPoint = e->screenPos();
     QPointF p = e->scenePos();
     p += QPoint(-2, -2);
-    resizeMode = NoResize;
+    m_resizeMode = NoResize;
     const QList <QGraphicsItem *> list = items(QRectF(p , QSizeF(4, 4)).toRect());
     QGraphicsItem *item = NULL;
     bool hasSelected = false;
@@ -181,28 +193,47 @@ void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e) {
                 setCursor(Qt::ClosedHandCursor);
             } else if (item->type() == 3 || item->type() == 13 || item->type() == 7) {
                 QRectF r;
-                if (m_selectedItem->type() == 3) {
+                if (m_selectedItem->type() == 3)
                     r = ((QGraphicsRectItem*)m_selectedItem)->rect();
-                } else r = m_selectedItem->boundingRect();
-
-                r.translate(item->scenePos());
-                if ((r.toRect().topLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                    resizeMode = TopLeft;
-                } else if ((r.toRect().bottomLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                    resizeMode = BottomLeft;
-                } else if ((r.toRect().topRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                    resizeMode = TopRight;
-                } else if ((r.toRect().bottomRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                    resizeMode = BottomRight;
-                } else if (qAbs(r.toRect().left() - e->scenePos().toPoint().x()) < 3 / zoom) {
-                    resizeMode = Left;
-                } else if (qAbs(r.toRect().right() - e->scenePos().toPoint().x()) < 3 / zoom) {
-                    resizeMode = Right;
-                } else if (qAbs(r.toRect().top() - e->scenePos().toPoint().y()) < 3 / zoom) {
-                    resizeMode = Up;
-                } else if (qAbs(r.toRect().bottom() - e->scenePos().toPoint().y()) < 3 / zoom) {
-                    resizeMode = Down;
-                } else setCursor(Qt::ClosedHandCursor);
+                else
+                    r = m_selectedItem->boundingRect();
+                /*
+                 * The vertices of the rectangle (check for matrix
+                 * transformation); i hope there is a shorter way to do this
+                 */
+                QPointF itemOrigin = item->scenePos();
+                QTransform transform = item->transform();
+                QPointF topLeft(transform.m11() * r.toRect().left() + transform.m21() * r.toRect().top() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().top() + transform.m12() * r.toRect().left() + transform.m32() + itemOrigin.y());
+                QPointF bottomLeft(transform.m11() * r.toRect().left() + transform.m21() * r.toRect().bottom() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().bottom() + transform.m12() * r.toRect().left() + transform.m32() + itemOrigin.y());
+                QPointF topRight(transform.m11() * r.toRect().right() + transform.m21() * r.toRect().top() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().top() + transform.m12() * r.toRect().right() + transform.m32() + itemOrigin.y());
+                QPointF bottomRight(transform.m11() * r.toRect().right() + transform.m21() * r.toRect().bottom() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().bottom() + transform.m12() * r.toRect().right() + transform.m32() + itemOrigin.y());
+                // The borders (using the transformed coordinates)
+                QGraphicsLineItem borderTop(topLeft.x(), topLeft.y(), topRight.x(), topRight.y());
+                QGraphicsLineItem borderRight(topRight.x(), topRight.y(), bottomRight.x(), bottomRight.y());
+                QGraphicsLineItem borderBottom(bottomRight.x(), bottomRight.y(), bottomLeft.x(), bottomLeft.y());
+                QGraphicsLineItem borderLeft(bottomLeft.x(), bottomLeft.y(), topLeft.x(), topLeft.y());
+                // The area interested by the mouse pointer
+                QPainterPath mouseArea;
+                mouseArea.addRect(e->scenePos().toPoint().x() - 3 / m_zoom, e->scenePos().toPoint().y() - 3 / m_zoom, 6 / m_zoom, 6 / m_zoom);
+                // Check for collisions between the mouse and the borders
+                if (borderLeft.collidesWithPath(mouseArea) && borderTop.collidesWithPath(mouseArea))
+                    m_resizeMode = TopLeft;
+                else if (borderLeft.collidesWithPath(mouseArea) && borderBottom.collidesWithPath(mouseArea))
+                    m_resizeMode = BottomLeft;
+                else if (borderRight.collidesWithPath(mouseArea) && borderTop.collidesWithPath(mouseArea))
+                    m_resizeMode = TopRight;
+                else if (borderRight.collidesWithPath(mouseArea) && borderBottom.collidesWithPath(mouseArea))
+                    m_resizeMode = BottomRight;
+                else if (borderLeft.collidesWithPath(mouseArea))
+                    m_resizeMode = Left;
+                else if (borderRight.collidesWithPath(mouseArea))
+                    m_resizeMode = Right;
+                else if (borderTop.collidesWithPath(mouseArea))
+                    m_resizeMode = Up;
+                else if (borderBottom.collidesWithPath(mouseArea))
+                    m_resizeMode = Down;
+                else
+                    setCursor(Qt::ClosedHandCursor);
             }
         }
         QGraphicsScene::mousePressEvent(e);
@@ -218,11 +249,12 @@ void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e) {
         QGraphicsScene::mousePressEvent(e);
     }
 
-    kDebug() << "//////  MOUSE CLICK, RESIZE MODE: " << resizeMode;
+    kDebug() << "//////  MOUSE CLICK, RESIZE MODE: " << m_resizeMode;
 
 }
 
-void GraphicsSceneRectMove::clearTextSelection() {
+void GraphicsSceneRectMove::clearTextSelection()
+{
     if (m_selectedItem && m_selectedItem->type() == 8) {
         // disable text editing
         QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(m_selectedItem);
@@ -236,7 +268,8 @@ void GraphicsSceneRectMove::clearTextSelection() {
 }
 
 //virtual
-void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
+void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e)
+{
     if ((e->screenPos() - m_clickPoint).manhattanLength() < QApplication::startDragDistance()) {
         e->accept();
         return;
@@ -244,49 +277,101 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
     if (m_selectedItem && e->buttons() & Qt::LeftButton) {
         if (m_selectedItem->type() == 3 || m_selectedItem->type() == 13 || m_selectedItem->type() == 7) {
             QRectF newrect;
-            if (m_selectedItem->type() == 3) {
+            if (m_selectedItem->type() == 3)
                 newrect = ((QGraphicsRectItem*)m_selectedItem)->rect();
-            } else newrect = m_selectedItem->boundingRect();
-
+            else
+                newrect = m_selectedItem->boundingRect();
             QPointF newpoint = e->scenePos();
-            //newpoint -= m_selectedItem->scenePos();
-            switch (resizeMode) {
-            case TopLeft:
-                newrect.setBottomRight(newrect.bottomRight() + m_selectedItem->pos() - newpoint);
-                m_selectedItem->setPos(newpoint);
-                break;
-            case BottomLeft:
-                newrect.setBottomRight(QPointF(newrect.bottomRight().x() + m_selectedItem->pos().x() - newpoint.x(), newpoint.y() - m_selectedItem->pos().y()));
-                m_selectedItem->setPos(QPointF(newpoint.x(), m_selectedItem->pos().y()));
-                break;
-            case TopRight:
-                newrect.setBottomRight(QPointF(newpoint.x() - m_selectedItem->pos().x(), newrect.bottom() + m_selectedItem->pos().y() - newpoint.y()));
-                m_selectedItem->setPos(QPointF(m_selectedItem->pos().x(), newpoint.y()));
-                break;
-            case BottomRight:
-                newrect.setBottomRight(newpoint - m_selectedItem->pos());
-                break;
-            case Left:
-                newrect.setRight(m_selectedItem->pos().x() + newrect.width() - newpoint.x());
-                m_selectedItem->setPos(QPointF(newpoint.x(), m_selectedItem->pos().y()));
-                break;
-            case Right:
-                newrect.setRight(newpoint.x() - m_selectedItem->pos().x());
-                break;
-            case Up:
-                newrect.setBottom(m_selectedItem->pos().y() + newrect.bottom() - newpoint.y());
-                m_selectedItem->setPos(QPointF(m_selectedItem->pos().x(), newpoint.y()));
-                break;
-            case Down:
-                newrect.setBottom(newpoint.y() - m_selectedItem->pos().y());
-                break;
-            default:
-                QPointF diff = e->scenePos() - m_sceneClickPoint;
-                m_sceneClickPoint = e->scenePos();
-                m_selectedItem->moveBy(diff.x(), diff.y());
-                break;
+            /*
+             * The vertices of the rectangle (check for matrix
+             * transformation); i hope there is a shorter way to do this
+             */
+            QPointF itemOrigin = m_selectedItem->scenePos();
+            QTransform transform = m_selectedItem->transform();
+            QPointF topLeft(transform.m11() * newrect.toRect().left() + transform.m21() * newrect.toRect().top() + transform.m31() + itemOrigin.x(), transform.m22() * newrect.toRect().top() + transform.m12() * newrect.toRect().left() + transform.m32() + itemOrigin.y());
+            QPointF bottomLeft(transform.m11() * newrect.toRect().left() + transform.m21() * newrect.toRect().bottom() + transform.m31() + itemOrigin.x(), transform.m22() * newrect.toRect().bottom() + transform.m12() * newrect.toRect().left() + transform.m32() + itemOrigin.y());
+            QPointF topRight(transform.m11() * newrect.toRect().right() + transform.m21() * newrect.toRect().top() + transform.m31() + itemOrigin.x(), transform.m22() * newrect.toRect().top() + transform.m12() * newrect.toRect().right() + transform.m32() + itemOrigin.y());
+            QPointF bottomRight(transform.m11() * newrect.toRect().right() + transform.m21() * newrect.toRect().bottom() + transform.m31() + itemOrigin.x(), transform.m22() * newrect.toRect().bottom() + transform.m12() * newrect.toRect().right() + transform.m32() + itemOrigin.y());
+            // Convert the mouse coordinates applying inverted transformation
+            QPointF newPointRelative = newpoint - itemOrigin;
+            QPointF resizePoint(transform.inverted().m11() * newPointRelative.x() + transform.inverted().m21() * newPointRelative.y() + transform.inverted().m31(), transform.inverted().m22() * newPointRelative.y() + transform.inverted().m12() * newPointRelative.x() + transform.inverted().m32());
+            /*
+             * Will check if the mouse is on the right of the limit lines with a
+             * determinant (it must be less than zero because the Y axis is
+             * inverted)
+             */
+            int determinant;
+            switch (m_resizeMode) {
+                case TopLeft:
+                    determinant = (bottomRight.x() - newpoint.x()) * (topRight.y() - newpoint.y()) - (bottomRight.y() - newpoint.y()) * (topRight.x() - newpoint.x());
+                    if (determinant < 0) {
+                        determinant = (bottomLeft.x() - newpoint.x()) * (bottomRight.y() - newpoint.y()) - (bottomLeft.y() - newpoint.y()) * (bottomRight.x() - newpoint.x());
+                        if (determinant < 0) {
+                            // resizePoint is not working for some reason
+                            newrect.setBottomRight(QPointF(newrect.width() - (transform.inverted().m11() * resizePoint.x() + transform.inverted().m21() * resizePoint.y() + transform.inverted().m31()), newrect.bottom() - (transform.inverted().m22() * resizePoint.y() + transform.inverted().m12() * resizePoint.x() + transform.inverted().m32())));
+                            m_selectedItem->setPos(resizePoint + itemOrigin);
+                        }
+                    }
+                    break;
+                case BottomLeft:
+                    determinant = (bottomRight.x() - newpoint.x()) * (topRight.y() - newpoint.y()) - (bottomRight.y() - newpoint.y()) * (topRight.x() - newpoint.x());
+                    if (determinant < 0) {
+                        determinant = (topRight.x() - newpoint.x()) * (topLeft.y() - newpoint.y()) - (topRight.y() - newpoint.y()) * (topLeft.x() - newpoint.x());
+                        if (determinant < 0) {
+                            newrect.setBottomRight(QPointF(newrect.width() - resizePoint.x(), resizePoint.y()));
+                            m_selectedItem->setPos(QPointF(transform.m11() * resizePoint.x() + transform.m21() * (newrect.bottom() - resizePoint.y()) + transform.m31() + itemOrigin.x(), transform.m22() * (newrect.bottom() - resizePoint.y()) + transform.m12() * resizePoint.x() + transform.m32() + itemOrigin.y()));
+                        }
+                    }
+                    break;
+                case TopRight:
+                    determinant = (topLeft.x() - newpoint.x()) * (bottomLeft.y() - newpoint.y()) - (topLeft.y() - newpoint.y()) * (bottomLeft.x() - newpoint.x());
+                    if (determinant < 0) {
+                        determinant = (bottomLeft.x() - newpoint.x()) * (bottomRight.y() - newpoint.y()) - (bottomLeft.y() - newpoint.y()) * (bottomRight.x() - newpoint.x());
+                        if (determinant < 0) {
+                            newrect.setBottomRight(QPointF(resizePoint.x(), newrect.bottom() - resizePoint.y()));
+                            m_selectedItem->setPos(QPointF(transform.m11() * (newrect.width() - resizePoint.x()) + transform.m21() * resizePoint.y() + transform.m31() + itemOrigin.x(), transform.m22() * resizePoint.y() + transform.m12() * (newrect.width() - resizePoint.x()) + transform.m32() + itemOrigin.y()));
+                        }
+                    }
+                    break;
+                case BottomRight:
+                    determinant = (topLeft.x() - newpoint.x()) * (bottomLeft.y() - newpoint.y()) - (topLeft.y() - newpoint.y()) * (bottomLeft.x() - newpoint.x());
+                    if (determinant < 0) {
+                        determinant = (topRight.x() - newpoint.x()) * (topLeft.y() - newpoint.y()) - (topRight.y() - newpoint.y()) * (topLeft.x() - newpoint.x());
+                        if (determinant < 0)
+                            newrect.setBottomRight(resizePoint);
+                    }
+                    break;
+                case Left:
+                    determinant = (bottomRight.x() - newpoint.x()) * (topRight.y() - newpoint.y()) - (bottomRight.y() - newpoint.y()) * (topRight.x() - newpoint.x());
+                    if (determinant < 0) {
+                        newrect.setRight(newrect.width() - resizePoint.x());
+                        m_selectedItem->setPos(QPointF(transform.m11() * resizePoint.x() + transform.m31() + itemOrigin.x(), transform.m12() * resizePoint.x() + transform.m32() + itemOrigin.y()));
+                    }
+                    break;
+                case Right:
+                    determinant = (topLeft.x() - newpoint.x()) * (bottomLeft.y() - newpoint.y()) - (topLeft.y() - newpoint.y()) * (bottomLeft.x() - newpoint.x());
+                    if (determinant < 0)
+                        newrect.setRight(resizePoint.x());
+                    break;
+                case Up:
+                    determinant = (bottomLeft.x() - newpoint.x()) * (bottomRight.y() - newpoint.y()) - (bottomLeft.y() - newpoint.y()) * (bottomRight.x() - newpoint.x());
+                    if (determinant < 0) {
+                        newrect.setBottom(newrect.bottom() - resizePoint.y());
+                        m_selectedItem->setPos(QPointF(transform.m21() * resizePoint.y() + transform.m31() + itemOrigin.x(), transform.m22() * resizePoint.y() + transform.m32() + itemOrigin.y()));
+                    }
+                    break;
+                case Down:
+                    determinant = (topRight.x() - newpoint.x()) * (topLeft.y() - newpoint.y()) - (topRight.y() - newpoint.y()) * (topLeft.x() - newpoint.x());
+                    if (determinant < 0)
+                        newrect.setBottom(resizePoint.y());
+                    break;
+                default:
+                    QPointF diff = e->scenePos() - m_sceneClickPoint;
+                    m_sceneClickPoint = e->scenePos();
+                    m_selectedItem->moveBy(diff.x(), diff.y());
+                    break;
             }
-            if (m_selectedItem->type() == 3 && resizeMode != NoResize) {
+            if (m_selectedItem->type() == 3 && m_resizeMode != NoResize) {
                 QGraphicsRectItem *gi = (QGraphicsRectItem*)m_selectedItem;
                 gi->setRect(newrect);
             }
@@ -316,7 +401,7 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
     } else if (m_tool == TITLE_SELECT) {
         QPointF p = e->scenePos();
         p += QPoint(-2, -2);
-        resizeMode = NoResize;
+        m_resizeMode = NoResize;
         bool itemFound = false;
         foreach(const QGraphicsItem* g, items(QRectF(p , QSizeF(4, 4)).toRect())) {
             if ((g->type() == 13 || g->type() == 7) && g->zValue() > -1000) {
@@ -325,25 +410,44 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
                 break;
             } else if (g->type() == 3 && g->zValue() > -1000) {
                 QRectF r = ((const QGraphicsRectItem*)g)->rect();
-                r.translate(g->scenePos());
                 itemFound = true;
-                if ((r.toRect().topLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                /*
+                 * The vertices of the rectangle (check for matrix
+                 * transformation); i hope there is a shorter way to do this
+                 */
+                QPointF itemOrigin = g->scenePos();
+                QTransform transform = g->transform();
+                QPointF topLeft(transform.m11() * r.toRect().left() + transform.m21() * r.toRect().top() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().top() + transform.m12() * r.toRect().left() + transform.m32() + itemOrigin.y());
+                QPointF bottomLeft(transform.m11() * r.toRect().left() + transform.m21() * r.toRect().bottom() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().bottom() + transform.m12() * r.toRect().left() + transform.m32() + itemOrigin.y());
+                QPointF topRight(transform.m11() * r.toRect().right() + transform.m21() * r.toRect().top() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().top() + transform.m12() * r.toRect().right() + transform.m32() + itemOrigin.y());
+                QPointF bottomRight(transform.m11() * r.toRect().right() + transform.m21() * r.toRect().bottom() + transform.m31() + itemOrigin.x(), transform.m22() * r.toRect().bottom() + transform.m12() * r.toRect().right() + transform.m32() + itemOrigin.y());
+                // The borders (using the transformed coordinates)
+                QGraphicsLineItem borderTop(topLeft.x(), topLeft.y(), topRight.x(), topRight.y());
+                QGraphicsLineItem borderRight(topRight.x(), topRight.y(), bottomRight.x(), bottomRight.y());
+                QGraphicsLineItem borderBottom(bottomRight.x(), bottomRight.y(), bottomLeft.x(), bottomLeft.y());
+                QGraphicsLineItem borderLeft(bottomLeft.x(), bottomLeft.y(), topLeft.x(), topLeft.y());
+                // The area interested by the mouse pointer
+                QPainterPath mouseArea;
+                mouseArea.addRect(e->scenePos().toPoint().x() - 3 / m_zoom, e->scenePos().toPoint().y() - 3 / m_zoom, 6 / m_zoom, 6 / m_zoom);
+                // Check for collisions between the mouse and the borders
+                if (borderLeft.collidesWithPath(mouseArea) && borderTop.collidesWithPath(mouseArea))
                     setCursor(QCursor(Qt::SizeFDiagCursor));
-                } else if ((r.toRect().bottomLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                else if (borderLeft.collidesWithPath(mouseArea) && borderBottom.collidesWithPath(mouseArea))
                     setCursor(QCursor(Qt::SizeBDiagCursor));
-                } else if ((r.toRect().topRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                else if (borderRight.collidesWithPath(mouseArea) && borderTop.collidesWithPath(mouseArea))
                     setCursor(QCursor(Qt::SizeBDiagCursor));
-                } else if ((r.toRect().bottomRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                else if (borderRight.collidesWithPath(mouseArea) && borderBottom.collidesWithPath(mouseArea))
                     setCursor(QCursor(Qt::SizeFDiagCursor));
-                } else if (qAbs(r.toRect().left() - e->scenePos().toPoint().x()) < 3 / zoom) {
+                else if (borderLeft.collidesWithPath(mouseArea))
                     setCursor(Qt::SizeHorCursor);
-                } else if (qAbs(r.toRect().right() - e->scenePos().toPoint().x()) < 3 / zoom) {
+                else if (borderRight.collidesWithPath(mouseArea))
                     setCursor(Qt::SizeHorCursor);
-                } else if (qAbs(r.toRect().top() - e->scenePos().toPoint().y()) < 3 / zoom) {
+                else if (borderTop.collidesWithPath(mouseArea))
                     setCursor(Qt::SizeVerCursor);
-                } else if (qAbs(r.toRect().bottom() - e->scenePos().toPoint().y()) < 3 / zoom) {
+                else if (borderBottom.collidesWithPath(mouseArea))
                     setCursor(Qt::SizeVerCursor);
-                } else setCursor(Qt::OpenHandCursor);
+                else
+                    setCursor(Qt::OpenHandCursor);
                 break;
             }
             if (!itemFound) setCursor(Qt::ArrowCursor);
@@ -356,13 +460,14 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
             emit newRect((QGraphicsRectItem *) m_selectedItem);
             m_selectedItem->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
             m_selectedItem->setPos(m_sceneClickPoint);
-            resizeMode = BottomRight;
+            m_resizeMode = BottomRight;
             QGraphicsScene::mouseMoveEvent(e);
         }
     }
 }
 
-void GraphicsSceneRectMove::wheelEvent(QGraphicsSceneWheelEvent * wheelEvent) {
+void GraphicsSceneRectMove::wheelEvent(QGraphicsSceneWheelEvent * wheelEvent)
+{
     QList<QGraphicsView*> viewlist = views();
     //kDebug() << wheelEvent->delta() << " " << zoom;
     if (viewlist.size() > 0) {
@@ -371,29 +476,32 @@ void GraphicsSceneRectMove::wheelEvent(QGraphicsSceneWheelEvent * wheelEvent) {
     }
 }
 
-void GraphicsSceneRectMove::setScale(double s) {
-    if (zoom < 1.0 / 7.0 && s < 1.0) return;
-    else if (zoom > 10.0 / 7.9 && s > 1.0) return;
+void GraphicsSceneRectMove::setScale(double s)
+{
+    if (m_zoom < 1.0 / 7.0 && s < 1.0) return;
+    else if (m_zoom > 10.0 / 7.9 && s > 1.0) return;
     QList<QGraphicsView*> viewlist = views();
     if (viewlist.size() > 0) {
         viewlist[0]->scale(s, s);
-        zoom = zoom * s;
+        m_zoom = m_zoom * s;
     }
     //kDebug()<<"//////////  ZOOM: "<<zoom;
 }
 
-void GraphicsSceneRectMove::setZoom(double s) {
+void GraphicsSceneRectMove::setZoom(double s)
+{
     QList<QGraphicsView*> viewlist = views();
     if (viewlist.size() > 0) {
         viewlist[0]->resetTransform();
         viewlist[0]->scale(s, s);
-        zoom = s;
+        m_zoom = s;
     }
 
     //kDebug()<<"//////////  ZOOM: "<<zoom;
 }
 
-void GraphicsSceneRectMove::setCursor(QCursor c) {
+void GraphicsSceneRectMove::setCursor(QCursor c)
+{
     const QList<QGraphicsView*> l = views();
     foreach(QGraphicsView* v, l) {
         v->setCursor(c);