Commit a3a24b74 authored by Aleksei Kanash's avatar Aleksei Kanash

Cursor upper widgets is the same as upper board.

Fixed restoring of cursors at mouse release event on board.
parent aa594554
...@@ -626,6 +626,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) ...@@ -626,6 +626,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event)
{ {
UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool ();
setToolCursor (currentTool);
// first propagate device release to the scene // first propagate device release to the scene
if (scene ()) if (scene ())
scene ()->inputDeviceRelease (); scene ()->inputDeviceRelease ();
...@@ -1019,6 +1020,7 @@ UBBoardView::setToolCursor (int tool) ...@@ -1019,6 +1020,7 @@ UBBoardView::setToolCursor (int tool)
break; break;
case UBStylusTool::Eraser: case UBStylusTool::Eraser:
controlViewport->setCursor (UBResources::resources ()->eraserCursor); controlViewport->setCursor (UBResources::resources ()->eraserCursor);
scene()->hideEraser();
break; break;
case UBStylusTool::Marker: case UBStylusTool::Marker:
controlViewport->setCursor (UBResources::resources ()->markerCursor); controlViewport->setCursor (UBResources::resources ()->markerCursor);
......
...@@ -47,6 +47,10 @@ UBGraphicsProxyWidget::~UBGraphicsProxyWidget() ...@@ -47,6 +47,10 @@ UBGraphicsProxyWidget::~UBGraphicsProxyWidget()
QVariant UBGraphicsProxyWidget::itemChange(GraphicsItemChange change, const QVariant &value) QVariant UBGraphicsProxyWidget::itemChange(GraphicsItemChange change, const QVariant &value)
{ {
if (change == QGraphicsItem::ItemCursorHasChanged && scene())
{
unsetCursor();
}
if ((change == QGraphicsItem::ItemSelectedHasChanged) if ((change == QGraphicsItem::ItemSelectedHasChanged)
&& scene()) && scene())
{ {
......
...@@ -2372,9 +2372,4 @@ void UBGraphicsScene::setToolCursor(int tool) ...@@ -2372,9 +2372,4 @@ void UBGraphicsScene::setToolCursor(int tool)
{ {
deselectAllItems(); deselectAllItems();
} }
if (tool != (int)UBStylusTool::Eraser)
{
hideEraser();
}
} }
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