Fixed tools undo

PixiEditor · Dec 16, 2021 · 700016e · 700016e
1 parent 4d06ec2
commit 700016e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/PixiEditor/Models/DataHolders/Document/Document.Layers.cs b/PixiEditor/Models/DataHolders/Document/Document.Layers.cs
@@ -458,7 +458,6 @@ public Layer MergeLayers(Layer[] layersToMerge, bool nameOfLast, int index)
             LayerStructure.AssignParent(mergedLayer.LayerGuid, groupParent?.GroupGuid);
 
             RemoveLayer(placeholderLayer, false);
-
             RemoveLayer(layersToMerge[^1], false);
 
             SetMainActiveLayer(Layers.IndexOf(mergedLayer));

diff --git a/PixiEditor/Models/Tools/BitmapOperationTool.cs b/PixiEditor/Models/Tools/BitmapOperationTool.cs
@@ -17,6 +17,8 @@ public abstract class BitmapOperationTool : Tool
 
         public bool UseDefaultUndoMethod { get; set; } = true;
 
+        public bool UseDocumentRectForUndo { get; set; } = false;
+
         private StorageBasedChange _change;
 
         public abstract void Use(Layer activeLayer, Layer previewLayer, IEnumerable<Layer> allLayers, IReadOnlyList<Coordinates> recordedMouseMovement, SKColor color);
@@ -62,8 +64,14 @@ private void InitializeStorageBasedChange(SKRectI toolSessionRect)
 
             if (toolSessionRect.IsEmpty)
             {
-                finalRect = SKRectI.Create(0, 0, doc.ActiveLayer.MaxWidth, doc.ActiveLayer.MaxHeight);
+                finalRect = SKRectI.Create(doc.ActiveLayer.OffsetX, doc.ActiveLayer.OffsetY, doc.ActiveLayer.Width, doc.ActiveLayer.Height);
             }
+
+            if (UseDocumentRectForUndo)
+            {
+                finalRect = SKRectI.Create(0, 0, doc.Width, doc.Height);
+            }
+
             _change = new StorageBasedChange(doc, new[] { new LayerChunk(doc.ActiveLayer, finalRect) });
         }
 

diff --git a/PixiEditor/Models/Tools/Tools/FloodFillTool.cs b/PixiEditor/Models/Tools/Tools/FloodFillTool.cs
@@ -17,6 +17,7 @@ public FloodFillTool(BitmapManager bitmapManager)
         {
             ActionDisplay = "Press on an area to fill it.";
             BitmapManager = bitmapManager;
+            UseDocumentRectForUndo = true;
         }
 
         public override string Tooltip => "Fills area with color. (G)";