Some progress in terms of groups undo

PixiEditor · Dec 12, 2021 · 018d1f3 · 018d1f3
1 parent aaefba3
commit 018d1f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/PixiEditor/Models/DataHolders/Document/Document.Layers.cs b/PixiEditor/Models/DataHolders/Document/Document.Layers.cs
@@ -137,7 +137,7 @@ public void UpdateLayersColor()
             }
         }
 
-        public void MoveLayerInStructure(Guid layerGuid, Guid referenceLayer, bool above = false)
+        public void MoveLayerInStructure(Guid layerGuid, Guid referenceLayer, bool above = false, bool addToUndo = true)
         {
             var args = new object[] { layerGuid, referenceLayer, above };
 
@@ -151,6 +151,8 @@ public void MoveLayerInStructure(Guid layerGuid, Guid referenceLayer, bool above
 
             AddLayerStructureToUndo(oldLayerStrcutureGroups);
 
+            if (!addToUndo) return;
+
             UndoManager.AddUndoChange(new Change(
                 ReverseMoveLayerInStructureProcess,
                 new object[] { oldIndex, layerGuid },

diff --git a/PixiEditor/Models/Tools/BitmapOperationTool.cs b/PixiEditor/Models/Tools/BitmapOperationTool.cs
@@ -40,6 +40,8 @@ public override void AfterUse()
             var document = ViewModels.ViewModelMain.Current.BitmapManager.ActiveDocument;
             var args = new object[] { _change.Document };
             document.UndoManager.AddUndoChange(_change.ToChange(StorageBasedChange.BasicUndoProcess, args));
+            document.AddLayerStructureToUndo(document.LayerStructure.Groups);
+            document.UndoManager.SquashUndoChanges(2);
             _change = null;
         }
     }

diff --git a/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs b/PixiEditor/ViewModels/SubViewModels/Main/LayersViewModel.cs
@@ -1,6 +1,7 @@
 using PixiEditor.Helpers;
 using PixiEditor.Models.Controllers;
 using PixiEditor.Models.Layers;
+using PixiEditor.Models.Undo;
 using PixiEditor.Views.UserControls.Layers;
 using System;
 using System.Linq;