From f1ea20c9dc2038a5d29a4c2c5bebcd4d7626220f Mon Sep 17 00:00:00 2001 From: letsfindaway Date: Sun, 12 Jun 2022 07:05:52 +0200 Subject: [PATCH] fix: ruler stays effective after deleted from board - set active ruler only with drawing tool - avoid setting the active ruler when entering the ruler to close it --- src/tools/UBGraphicsRuler.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/UBGraphicsRuler.cpp b/src/tools/UBGraphicsRuler.cpp index a0b97951..da0b056a 100644 --- a/src/tools/UBGraphicsRuler.cpp +++ b/src/tools/UBGraphicsRuler.cpp @@ -420,9 +420,6 @@ void UBGraphicsRuler::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); - if (UBDrawingController::drawingController()->mActiveRuler == nullptr) - UBDrawingController::drawingController()->mActiveRuler = this; - if (currentTool == UBStylusTool::Selector || currentTool == UBStylusTool::Play) { @@ -453,6 +450,7 @@ void UBGraphicsRuler::hoverEnterEvent(QGraphicsSceneHoverEvent *event) else if (UBDrawingController::drawingController()->isDrawingTool()) { setCursor(drawRulerLineCursor()); + UBDrawingController::drawingController()->mActiveRuler = this; event->accept(); } }