SANKORE-47 (fix for compass component)

57f90755 · Anatoly Mihalchenko · 375e1470 · 57f90755
Commit 57f90755 authored Mar 19, 2012 by Anatoly Mihalchenko
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

UBBoardView.cpp src/board/UBBoardView.cpp +7 -4

No files found.
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -416,12 +416,15 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
        }
      else if (currentTool == UBStylusTool::Selector)
        {
+            QSet<QGraphicsItem*> existingTools = scene()->tools();
+
            movingItem = scene()->itemAt(this->mapToScene(event->posF().toPoint()));

-            if (!movingItem || 
-                movingItem->isSelected() || 
-                (movingItem->type() == UBGraphicsDelegateFrame::Type ||         
-                movingItem->type() == DelegateButton::Type))
+            if (!movingItem 
+                || movingItem->isSelected()
+                || (movingItem->type() == UBGraphicsDelegateFrame::Type
+                || movingItem->type() == DelegateButton::Type) 
+                || existingTools.contains(movingItem))
                {
                    movingItem = NULL;
                    QGraphicsView::mousePressEvent (event);