Merge branch 'master' of https://github.com/huderlem/porymap into slam

include/editor.h

@@ -24,6 +24,7 @@
 #include "collisionpixmapitem.h"
 #include "layoutpixmapitem.h"
 #include "settings.h"
+#include "gridsettings.h"
 #include "movablerect.h"
 #include "cursortilerect.h"
 #include "mapruler.h"
@@ -54,6 +55,7 @@ public:
     QUndoGroup editGroup; // Manages the undo history for each map
 
     Settings *settings;
+    GridSettings gridSettings;
 
     void setProject(Project * project);
     void save();
@@ -83,6 +85,7 @@ public:
     void displayMapConnections();
     void displayMapBorder();
     void displayMapGrid();
+    void updateMapGrid();
     void displayWildMonTables();
 
     void updateMapBorder();
@@ -132,7 +135,7 @@ public:
     QGraphicsItemGroup *events_group = nullptr;
 
     QList<QGraphicsPixmapItem*> borderItems;
-    QList<QGraphicsLineItem*> gridLines;
+    QGraphicsItemGroup *mapGrid = nullptr;
     MapRuler *map_ruler = nullptr;
 
     MovableRect *playerViewRect = nullptr;
@@ -197,6 +200,7 @@ public slots:
     void maskNonVisibleConnectionTiles();
     void onBorderMetatilesChanged();
     void selectedEventIndexChanged(int index, Event::Group eventGroup);
+    void toggleGrid(bool);
 
 private:
     const QImage defaultCollisionImgSheet = QImage(":/images/collisions.png");
@@ -251,7 +255,6 @@ private slots:
     void onHoveredMapMovementPermissionCleared();
     void onSelectedMetatilesChanged();
     void onWheelZoom(int);
-    void onToggleGridClicked(bool);
 
 signals:
     void objectsChanged();
@@ -263,6 +266,7 @@ signals:
     void currentMetatilesSelectionChanged();
     void mapRulerStatusChanged(const QString &);
     void tilesetUpdated(QString);
+    void gridToggled(bool);
 };
 
 #endif // EDITOR_H