Commit 19d31ccc authored by Ilia Ryabokon's avatar Ilia Ryabokon

Rubber band in play mode disabled

parent a55b01c9
...@@ -75,6 +75,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool ...@@ -75,6 +75,7 @@ UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent, bool
, mIsDragInProgress(false) , mIsDragInProgress(false)
, mMultipleSelectionIsEnabled(false) , mMultipleSelectionIsEnabled(false)
, isControl(pIsControl) , isControl(pIsControl)
, mRubberBandInPlayMode(false) //enables rubberband with play tool
{ {
init (); init ();
...@@ -1020,6 +1021,8 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event) ...@@ -1020,6 +1021,8 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event)
return; return;
} }
if (currentTool != UBStylusTool::Play || mRubberBandInPlayMode) {
if (!movingItem && (mMouseButtonIsPressed || mTabletStylusIsPressed) && mUBRubberBand && mUBRubberBand->isVisible()) { if (!movingItem && (mMouseButtonIsPressed || mTabletStylusIsPressed) && mUBRubberBand && mUBRubberBand->isVisible()) {
QRect bandRect(mMouseDownPos, event->pos()); QRect bandRect(mMouseDownPos, event->pos());
...@@ -1054,6 +1057,7 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event) ...@@ -1054,6 +1057,7 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event)
} }
} }
} }
}
handleItemMouseMove(event); handleItemMouseMove(event);
} }
......
...@@ -154,6 +154,7 @@ class UBBoardView : public QGraphicsView ...@@ -154,6 +154,7 @@ class UBBoardView : public QGraphicsView
bool mIsDragInProgress; bool mIsDragInProgress;
bool mMultipleSelectionIsEnabled; bool mMultipleSelectionIsEnabled;
bool isControl; bool isControl;
bool mRubberBandInPlayMode;
static bool hasSelectedParents(QGraphicsItem * item); static bool hasSelectedParents(QGraphicsItem * item);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment