From 7e83f910ca5caa193f49363c7cff4c175eefee92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= Date: Thu, 18 Nov 2021 14:00:39 +0100 Subject: [PATCH] restore call to QGraphicsView::mouseMoveEvent if drawing mode and not pressed --- src/board/UBBoardView.cpp | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 99402ca9..f60cbd19 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -1141,6 +1141,9 @@ void UBBoardView::mouseMoveEvent (QMouseEvent *event) return; } + if ((UBDrawingController::drawingController()->isDrawingTool()) && !mMouseButtonIsPressed) + QGraphicsView::mouseMoveEvent(event); + int currentTool = static_cast(UBDrawingController::drawingController()->stylusTool()); switch (currentTool) { @@ -1243,35 +1246,6 @@ void UBBoardView::mouseMoveEvent (QMouseEvent *event) if (!mTabletStylusIsPressed && scene()) { scene()->inputDeviceMove(mapToScene(UBGeometryUtils::pointConstrainedInRect(event->pos(), rect())) , mMouseButtonIsPressed); } - if (UBDrawingController::drawingController()->isDrawingTool()) - { - QGraphicsItem* item = scene()->itemAt(mapToScene(event->pos()), QTransform()); - if (item) - { - //if showMarkerPreviewCircle, showPenPreviewCircle or showEraserPreviewCircle is true, then the topmost visible item under the mouse is the preview circle - QGraphicsEllipseItem* circle = dynamic_cast(scene()->itemAt(mapToScene(event->pos()), QTransform())); - if (circle) - { - circle->setVisible(false); - item = scene()->itemAt(mapToScene(event->pos()), QTransform()); - if (item) - { - if (item->type() == UBGraphicsRuler::Type || item->type() == UBGraphicsTriangle::Type) - { - QGraphicsView::mouseMoveEvent(event); - } - } - circle->setVisible(true); - } - else - { - if (item->type() == UBGraphicsRuler::Type || item->type() == UBGraphicsTriangle::Type) - { - QGraphicsView::mouseMoveEvent(event); - } - } - } - } event->accept (); }