From 273dbaa94f57924d247eed619f96095764c30db5 Mon Sep 17 00:00:00 2001 From: BigBahss Date: Fri, 2 Oct 2020 22:31:44 -0400 Subject: [PATCH] Prevent ruler activation when right-clicking event in paint mode --- src/ui/draggablepixmapitem.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ui/draggablepixmapitem.cpp b/src/ui/draggablepixmapitem.cpp index a293aba6..d920662d 100644 --- a/src/ui/draggablepixmapitem.cpp +++ b/src/ui/draggablepixmapitem.cpp @@ -63,13 +63,15 @@ void DraggablePixmapItem::mousePressEvent(QGraphicsSceneMouseEvent *mouse) { last_y = pos.y(); this->editor->selectMapEvent(this, mouse->modifiers() & Qt::ControlModifier); this->editor->selectingEvent = true; - if (!this->editor->map_ruler->isAnchored() && this->editor->map_ruler->isMousePressed(mouse)) { - this->editor->map_ruler->setAnchor(mouse->scenePos(), mouse->screenPos()); - } else if (this->editor->map_ruler->isAnchored()) { - if (mouse->buttons() & Qt::LeftButton) - this->editor->map_ruler->locked = !this->editor->map_ruler->locked; - if (this->editor->map_ruler->isMousePressed(mouse)) - this->editor->map_ruler->endAnchor(); + if (this->editor->obj_edit_mode == "select") { + if (!this->editor->map_ruler->isAnchored() && this->editor->map_ruler->isMousePressed(mouse)) { + this->editor->map_ruler->setAnchor(mouse->scenePos(), mouse->screenPos()); + } else if (this->editor->map_ruler->isAnchored()) { + if (mouse->buttons() & Qt::LeftButton) + this->editor->map_ruler->locked = !this->editor->map_ruler->locked; + if (this->editor->map_ruler->isMousePressed(mouse)) + this->editor->map_ruler->endAnchor(); + } } }