From f42e9ed3cf06d015bc959845c94cced9b7a338f1 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sat, 21 Jun 2025 23:26:35 -0400
Subject: [PATCH] Fix Move tool affecting cursor anchor

---
 include/editor.h |  7 ++++---
 src/editor.cpp   | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/editor.h b/include/editor.h
index 10891e4c..414356d1 100644
--- a/include/editor.h
+++ b/include/editor.h
@@ -172,7 +172,7 @@ public:
     void setEditMode(EditMode editMode);
     EditMode getEditMode() const { return this->editMode; }
 
-    bool getEditingLayout();
+    bool getEditingLayout() const;
 
     void setMapEditingButtonsEnabled(bool enabled);
 
@@ -256,10 +256,11 @@ private:
     static bool startDetachedProcess(const QString &command,
                                     const QString &workingDirectory = QString(),
                                     qint64 *pid = nullptr);
-
-private slots:
+    bool canPaintMetatiles() const;
     void onMapStartPaint(QGraphicsSceneMouseEvent *event, LayoutPixmapItem *item);
     void onMapEndPaint(QGraphicsSceneMouseEvent *event, LayoutPixmapItem *item);
+
+private slots:
     void setSmartPathCursorMode(QGraphicsSceneMouseEvent *event);
     void mouseEvent_map(QGraphicsSceneMouseEvent *event, LayoutPixmapItem *item);
     void mouseEvent_collision(QGraphicsSceneMouseEvent *event, CollisionPixmapItem *item);
diff --git a/src/editor.cpp b/src/editor.cpp
index b7e73b09..f64c4b40 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -125,7 +125,7 @@ void Editor::closeProject() {
     delete this->project;
 }
 
-bool Editor::getEditingLayout() {
+bool Editor::getEditingLayout() const {
     return this->editMode == EditMode::Metatiles || this->editMode == EditMode::Collision;
 }
 
@@ -1366,8 +1366,12 @@ bool Editor::setLayout(QString layoutId) {
     return true;
 }
 
+bool Editor::canPaintMetatiles() const {
+    return this->editMode == EditMode::Metatiles && this->mapEditAction != EditAction::Select && this->mapEditAction != EditAction::Move;
+}
+
 void Editor::onMapStartPaint(QGraphicsSceneMouseEvent *event, LayoutPixmapItem *) {
-    if (!this->getEditingLayout()) {
+    if (!canPaintMetatiles()) {
         return;
     }
 
@@ -1380,7 +1384,7 @@ void Editor::onMapStartPaint(QGraphicsSceneMouseEvent *event, LayoutPixmapItem *
 }
 
 void Editor::onMapEndPaint(QGraphicsSceneMouseEvent *, LayoutPixmapItem *) {
-    if (!this->getEditingLayout()) {
+    if (!canPaintMetatiles()) {
         return;
     }
     this->cursorMapTileRect->stopRightClickSelectionAnchor();