Properly handle set/undo/redo.

mapeditor · Oct 5, 2022 · 9862eca · 9862eca
1 parent 6d33970
commit 9862eca
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 2 deletions.
diff --git a/src/libtiled/tile.cpp b/src/libtiled/tile.cpp
@@ -170,7 +170,7 @@ const QPoint &Tile::drawOffset() const
 /**
  * Sets the local draw offset of the tile (in pixels).
  */
-void Tile::setDrawOffset(QPoint &offset)
+void Tile::setDrawOffset(const QPoint &offset)
 {
     this->mDrawOffset.setX(offset.x());
     this->mDrawOffset.setY(offset.y());

diff --git a/src/libtiled/tile.h b/src/libtiled/tile.h
@@ -91,7 +91,7 @@ class TILEDSHARED_EXPORT Tile : public Object
 
     QPoint offset() const;
     const QPoint &drawOffset() const;
-    void setDrawOffset(QPoint &offset);
+    void setDrawOffset(const QPoint &offset);
 
     // For Python API compatibility
     const QString &type() const { return className(); }

diff --git a/src/tiled/changetile.cpp b/src/tiled/changetile.cpp
@@ -84,4 +84,41 @@ void ChangeTileImageRect::setValue(Tile *tile, const QRect &rect) const
         emit mapDocument->tileImageSourceChanged(tile);
 }
 
+
+ChangeTileDrawOffset::ChangeTileDrawOffset(TilesetDocument *tilesetDocument,
+                                         const QList<Tile *> &tiles,
+                                         const QPoint &rects,
+                                         QUndoCommand *parent)
+    : ChangeValue(tilesetDocument, tiles, rects, parent)
+{
+    setText(QCoreApplication::translate("Undo Commands",
+                                        "Change Image Draw Offset"));
+}
+
+ChangeTileDrawOffset::ChangeTileDrawOffset(TilesetDocument *tilesetDocument,
+                                         const QList<Tile *> &tiles,
+                                         const QVector<QPoint> &rects,
+                                         QUndoCommand *parent)
+    : ChangeValue(tilesetDocument, tiles, rects, parent)
+{
+    setText(QCoreApplication::translate("Undo Commands",
+                                        "Change Image Draw Offset"));
+}
+
+QPoint ChangeTileDrawOffset::getValue(const Tile *tile) const
+{
+    return tile->drawOffset();
+}
+
+void ChangeTileDrawOffset::setValue(Tile *tile, const QPoint &offset) const
+{
+    tile->setDrawOffset(offset);
+
+    //since we changed the offset we need to tell it to update any maps
+    emit static_cast<TilesetDocument*>(document())->tileImageSourceChanged(tile);
+
+    for (MapDocument *mapDocument : static_cast<TilesetDocument*>(document())->mapDocuments())
+        emit mapDocument->tileImageSourceChanged(tile);
+}
+
 } // namespace Tiled
diff --git a/src/tiled/changetile.h b/src/tiled/changetile.h
@@ -24,6 +24,7 @@
 #include "undocommands.h"
 
 #include <QVector>
+#include <QPoint>
 
 namespace Tiled {
 
@@ -66,4 +67,24 @@ class ChangeTileImageRect : public ChangeValue<Tile, QRect>
     void setValue(Tile *tile, const QRect &rect) const override;
 };
 
+class ChangeTileDrawOffset : public ChangeValue<Tile, QPoint>
+{
+public:
+    ChangeTileDrawOffset(TilesetDocument *tilesetDocument,
+                          const QList<Tile*> &tiles,
+                          const QPoint &offsets,
+                          QUndoCommand *parent = nullptr);
+
+    ChangeTileDrawOffset(TilesetDocument *tilesetDocument,
+                          const QList<Tile*> &tiles,
+                          const QVector<QPoint> &offsets,
+                          QUndoCommand *parent = nullptr);
+
+    int id() const override { return Cmd_ChangeTileDrawOffset; }
+
+protected:
+    QPoint getValue(const Tile *tile) const override;
+    void setValue(Tile *tile, const QPoint &offset) const override;
+};
+
 } // namespace Tiled
diff --git a/src/tiled/propertybrowser.cpp b/src/tiled/propertybrowser.cpp
@@ -1621,6 +1621,13 @@ void PropertyBrowser::applyTileValue(PropertyId id, const QVariant &val)
                                                   tile, filePath.url));
         break;
     }
+    case TileDrawOffsetProperty: {
+        undoStack->push(new ChangeTileDrawOffset(mTilesetDocument,
+                                                mTilesetDocument->selectedTiles(),
+                                                val.toPoint()));
+
+        break;
+    }
     default:
         break;
     }

diff --git a/src/tiled/undocommands.h b/src/tiled/undocommands.h
@@ -52,6 +52,7 @@ enum UndoCommands {
     Cmd_EraseTiles,
     Cmd_PaintTileLayer,
     Cmd_SetProperty,
+    Cmd_ChangeTileDrawOffset,
 };
 
 /**