Improved default undo method

PixiEditor · Dec 14, 2021 · 9cdfce6 · 9cdfce6
1 parent f68b5ef
commit 9cdfce6
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/PixiEditor/Models/Tools/BitmapOperationTool.cs b/PixiEditor/Models/Tools/BitmapOperationTool.cs
@@ -21,10 +21,9 @@ public abstract class BitmapOperationTool : Tool
 
         public override void BeforeUse()
         {
-            if (UseDefaultUndoMethod)
+            if (UseDefaultUndoMethod && !RequiresPreviewLayer)
             {
-                Document doc = ViewModels.ViewModelMain.Current.BitmapManager.ActiveDocument;
-                _change = new StorageBasedChange(doc, new[] { doc.ActiveLayer }, true);
+                InitializeStorageBasedChange();
             }
         }
 
@@ -36,12 +35,24 @@ public override void AfterUse()
         {
             if (!UseDefaultUndoMethod)
                 return;
+
+            if (RequiresPreviewLayer)
+            {
+                InitializeStorageBasedChange();
+            }
+
             var document = ViewModels.ViewModelMain.Current.BitmapManager.ActiveDocument;
             var args = new object[] { _change.Document };
             document.UndoManager.AddUndoChange(_change.ToChange(UndoStorageBasedChange, args));
             _change = null;
         }
 
+        private void InitializeStorageBasedChange()
+        {
+            Document doc = ViewModels.ViewModelMain.Current.BitmapManager.ActiveDocument;
+            _change = new StorageBasedChange(doc, new[] {doc.ActiveLayer}, true);
+        }
+
         private void UndoStorageBasedChange(Layer[] layers, UndoLayer[] data, object[] args)
         {
             Document document = (Document)args[0];