Fix some tool button issues

include/editor.h

@@ -162,8 +162,10 @@ public:
     QPointer<MapConnection> connection_to_select = nullptr;
 
     enum class EditAction { None, Paint, Select, Fill, Shift, Pick, Move };
-    EditAction mapEditAction = EditAction::Paint;
-    EditAction eventEditAction = EditAction::Select;
+    void setEditAction(EditAction editAction);
+    EditAction getEditAction() const;
+    EditAction getMapEditAction() const { return this->mapEditAction; }
+    EditAction getEventEditAction() const { return this->eventEditAction; }
 
     enum class EditMode { None, Disabled, Metatiles, Collision, Header, Events, Connections, Encounters };
     void setEditMode(EditMode editMode);
@@ -220,6 +222,9 @@ private:
 
     EditMode editMode = EditMode::None;
 
+    EditAction mapEditAction = EditAction::Paint;
+    EditAction eventEditAction = EditAction::Select;
+
     bool save(bool currentOnly);
     void clearMap();
     void clearMetatileSelector();
@@ -280,6 +285,7 @@ signals:
     void mapRulerStatusChanged(const QString &);
     void tilesetUpdated(QString);
     void gridToggled(bool);
+    void editActionSet(EditAction newEditAction);
 };
 
 #endif // EDITOR_H

include/mainwindow.h

@@ -407,8 +407,7 @@ private:
     void openNextMap();
 
     void displayMapProperties();
-    void checkToolButtons();
-    void clickToolButtonFromEditAction(Editor::EditAction editAction);
+    void setEditActionUi(Editor::EditAction editAction);
 
     void updateWindowTitle();
 

include/ui/layoutpixmapitem.h

@@ -92,6 +92,7 @@ public:
 private:
     void paintSmartPath(int x, int y, bool fromScriptCall = false);
     static QList<int> smartPathTable;
+    QPoint lastMetatileSelectionPos = QPoint(-1,-1);
 
     unsigned actionId_ = 0;