Fixed nudge and mid change undo

src/PixiEditor/Models/DocumentModels/ChangeExecutionController.cs

@@ -4,6 +4,7 @@ using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.ColorsImpl;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Tools;
 using PixiEditor.Numerics;
@@ -18,7 +19,7 @@ internal class ChangeExecutionController
     public VecI LastPixelPosition => lastPixelPos;
     public VecD LastPrecisePosition => lastPrecisePos;
     public bool IsBlockingChangeActive => currentSession is not null && currentSession.BlocksOtherActions;
-    
+
     public event Action ToolSessionFinished;
 
     private readonly IDocument document;
@@ -29,7 +30,7 @@ internal class ChangeExecutionController
     private VecD lastPrecisePos;
 
     private UpdateableChangeExecutor? currentSession = null;
-    
+
     private UpdateableChangeExecutor? _queuedExecutor = null;
 
     public ChangeExecutionController(IDocument document, DocumentInternalParts internals, IServiceProvider services)
@@ -39,6 +40,11 @@ internal class ChangeExecutionController
         this.services = services;
     }
 
+    public bool IsChangeOfTypeActive<T>() where T : IExecutorFeature
+    {
+        return currentSession is T sessionT && sessionT.IsFeatureEnabled(sessionT);
+    }
+
     public ExecutorType GetCurrentExecutorType()
     {
         if (currentSession is null)
@@ -53,7 +59,7 @@ internal class ChangeExecutionController
             return false;
         if (force)
             currentSession?.ForceStop();
-        
+
         T executor = new T();
         return TryStartExecutorInternal(executor);
     }
@@ -64,7 +70,7 @@ internal class ChangeExecutionController
             return false;
         if (force)
             currentSession?.ForceStop();
-        
+
         return TryStartExecutorInternal(brandNewExecutor);
     }
 
@@ -76,7 +82,7 @@ internal class ChangeExecutionController
     private bool TryStartExecutorInternal(UpdateableChangeExecutor executor)
     {
         executor.Initialize(document, internals, services, this, EndExecutor);
-        
+
         if (executor.StartMode == ExecutorStartMode.OnMouseLeftButtonDown)
         {
             _queuedExecutor = executor;
@@ -85,7 +91,7 @@ internal class ChangeExecutionController
 
         return StartExecutor(executor);
     }
-    
+
     private bool StartExecutor(UpdateableChangeExecutor brandNewExecutor)
     {
         if (brandNewExecutor.Start() == ExecutionState.Success)
@@ -103,7 +109,7 @@ internal class ChangeExecutionController
             throw new InvalidOperationException();
         currentSession = null;
         _queuedExecutor = null;
-        
+
         ToolSessionFinished?.Invoke();
     }
 
@@ -113,13 +119,32 @@ internal class ChangeExecutionController
             return false;
         currentSession.ForceStop();
         currentSession = null;
-        
+
         ToolSessionFinished?.Invoke();
         return true;
     }
 
-    public void MidChangeUndoInlet() => currentSession?.OnMidChangeUndo();
-    public void MidChangeRedoInlet() => currentSession?.OnMidChangeRedo();
+    public void MidChangeUndoInlet()
+    {
+        if (currentSession is null)
+            return;
+
+        if (currentSession is IMidChangeUndoableExecutor undoableExecutor)
+        {
+            undoableExecutor.OnMidChangeUndo();
+        }
+    }
+
+    public void MidChangeRedoInlet()
+    {
+        if (currentSession is null)
+            return;
+
+        if (currentSession is IMidChangeUndoableExecutor undoableExecutor)
+        {
+            undoableExecutor.OnMidChangeRedo();
+        }
+    }
 
     public void ConvertedKeyDownInlet(Key key)
     {
@@ -141,6 +166,7 @@ internal class ChangeExecutionController
             lastPixelPos = newPixelPos;
             pixelPosChanged = true;
         }
+
         lastPrecisePos = newCanvasPos;
 
         //call session events
@@ -153,13 +179,16 @@ internal class ChangeExecutionController
     }
 
     public void OpacitySliderDragStartedInlet() => currentSession?.OnOpacitySliderDragStarted();
+
     public void OpacitySliderDraggedInlet(float newValue)
     {
         currentSession?.OnOpacitySliderDragged(newValue);
     }
+
     public void OpacitySliderDragEndedInlet() => currentSession?.OnOpacitySliderDragEnded();
 
     public void SymmetryDragStartedInlet(SymmetryAxisDirection dir) => currentSession?.OnSymmetryDragStarted(dir);
+
     public void SymmetryDraggedInlet(SymmetryAxisDragInfo info)
     {
         currentSession?.OnSymmetryDragged(info);
@@ -176,7 +205,7 @@ internal class ChangeExecutionController
         {
             StartExecutor(_queuedExecutor);
         }
-        
+
         //call session event
         currentSession?.OnLeftMouseButtonDown(canvasPos);
     }
@@ -192,17 +221,26 @@ internal class ChangeExecutionController
 
     public void TransformMovedInlet(ShapeCorners corners)
     {
-        LastTransformState = corners;
-        currentSession?.OnTransformMoved(corners);
+        if (currentSession is ITransformableExecutor transformableExecutor)
+        {
+            LastTransformState = corners;
+            transformableExecutor.OnTransformMoved(corners);
+        }
     }
-    
+
     public void MembersSelectedInlet(List<Guid> memberGuids)
     {
         currentSession?.OnMembersSelected(memberGuids);
     }
-    
-    public void TransformAppliedInlet() => currentSession?.OnTransformApplied();
-    
+
+    public void TransformAppliedInlet()
+    {
+        if (currentSession is ITransformableExecutor transformableExecutor)
+        {
+            transformableExecutor.OnTransformApplied();
+        }
+    } 
+
     public void SettingsChangedInlet(string name, object value)
     {
         currentSession?.OnSettingsChanged(name, value);
@@ -210,12 +248,18 @@ internal class ChangeExecutionController
 
     public void LineOverlayMovedInlet(VecD start, VecD end)
     {
-        currentSession?.OnLineOverlayMoved(start, end);
+        if (currentSession is ITransformableExecutor lineOverlayExecutor)
+        {
+            lineOverlayExecutor.OnLineOverlayMoved(start, end);
+        } 
     }
 
     public void SelectedObjectNudgedInlet(VecI distance)
     {
-        currentSession?.OnSelectedObjectNudged(distance);
+        if (currentSession is ITransformableExecutor transformableExecutor)
+        {
+            transformableExecutor.OnSelectedObjectNudged(distance);
+        } 
     }
 
     public void PrimaryColorChangedInlet(Color color)
@@ -227,5 +271,4 @@ internal class ChangeExecutionController
     {
         currentSession?.OnColorChanged(color, false);
     }
-
 }

src/PixiEditor/Models/DocumentModels/Public/DocumentOperationsModule.cs

@@ -11,6 +11,7 @@ using PixiEditor.DrawingApi.Core.Surfaces.Vector;
 using PixiEditor.Extensions.CommonApi.Palettes;
 using PixiEditor.Models.Clipboard;
 using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Models.DocumentPassthroughActions;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Layers;
@@ -375,7 +376,7 @@ internal class DocumentOperationsModule : IDocumentOperations
     /// </summary>
     public void Undo()
     {
-        if (Internals.ChangeController.IsBlockingChangeActive)
+        if (Internals.ChangeController.IsChangeOfTypeActive<IMidChangeUndoableExecutor>())
         {
             Internals.ChangeController.MidChangeUndoInlet();
             return;
@@ -389,7 +390,7 @@ internal class DocumentOperationsModule : IDocumentOperations
     /// </summary>
     public void Redo()
     {
-        if (Internals.ChangeController.IsBlockingChangeActive)
+        if (Internals.ChangeController.IsChangeOfTypeActive<IMidChangeUndoableExecutor>())
         {
             Internals.ChangeController.MidChangeRedoInlet();
             return;
@@ -400,7 +401,7 @@ internal class DocumentOperationsModule : IDocumentOperations
 
     public void NudgeSelectedObject(VecI distance)
     {
-        if (Internals.ChangeController.IsBlockingChangeActive)
+        if (Internals.ChangeController.IsChangeOfTypeActive<ITransformableExecutor>())
         {
             Internals.ChangeController.SelectedObjectNudgedInlet(distance);
         }

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/Features/IExecutorFeature.cs

@@ -0,0 +1,6 @@
+namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
+
+public interface IExecutorFeature
+{
+    public bool IsFeatureEnabled(IExecutorFeature feature);
+}

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/Features/IMidChangeUndoableExecutor.cs

@@ -0,0 +1,7 @@
+namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
+
+public interface IMidChangeUndoableExecutor : IExecutorFeature
+{
+    public void OnMidChangeUndo();
+    public void OnMidChangeRedo();
+}

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/Features/ITransformableExecutor.cs

@@ -0,0 +1,13 @@
+using ChunkyImageLib.DataHolders;
+using PixiEditor.Numerics;
+
+namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
+
+public interface ITransformableExecutor : IExecutorFeature
+{
+    public bool IsTransforming { get; }
+    public void OnTransformMoved(ShapeCorners corners); 
+    public void OnTransformApplied();
+    public void OnLineOverlayMoved(VecD start, VecD end);
+    public void OnSelectedObjectNudged(VecI distance);
+}

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/PasteImageExecutor.cs

@@ -4,13 +4,14 @@ using PixiEditor.ChangeableDocument.Actions.Generated;
 using PixiEditor.DrawingApi.Core;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surfaces.Vector;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Tools;
 using PixiEditor.Numerics;
 
 namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
 #nullable enable
-internal class PasteImageExecutor : UpdateableChangeExecutor
+internal class PasteImageExecutor : UpdateableChangeExecutor, ITransformableExecutor, IMidChangeUndoableExecutor
 {
     private readonly Surface image;
     private readonly VecI pos;
@@ -60,18 +61,22 @@ internal class PasteImageExecutor : UpdateableChangeExecutor
         return ExecutionState.Success;
     }
 
-    public override void OnTransformMoved(ShapeCorners corners)
+    public bool IsTransforming => true; 
+
+    public void OnTransformMoved(ShapeCorners corners)
     {
         internals!.ActionAccumulator.AddActions(new PasteImage_Action(image, corners, memberGuid.Value, false, drawOnMask, document!.AnimationHandler.ActiveFrameBindable, default));
     }
 
-    public override void OnSelectedObjectNudged(VecI distance) => document!.TransformHandler.Nudge(distance);
+    public void OnLineOverlayMoved(VecD start, VecD end) { }
+
+    public void OnSelectedObjectNudged(VecI distance) => document!.TransformHandler.Nudge(distance);
 
-    public override void OnMidChangeUndo() => document!.TransformHandler.Undo();
+    public void OnMidChangeUndo() => document!.TransformHandler.Undo();
 
-    public override void OnMidChangeRedo() => document!.TransformHandler.Redo();
+    public void OnMidChangeRedo() => document!.TransformHandler.Redo();
 
-    public override void OnTransformApplied()
+    public void OnTransformApplied()
     {
         internals!.ActionAccumulator.AddFinishedActions(new EndPasteImage_Action());
         document!.TransformHandler.HideTransform();
@@ -83,4 +88,15 @@ internal class PasteImageExecutor : UpdateableChangeExecutor
         document!.TransformHandler.HideTransform();
         internals!.ActionAccumulator.AddActions(new EndPasteImage_Action());
     }
+
+    public bool IsFeatureEnabled(IExecutorFeature feature)
+    {
+        if (feature is ITransformableExecutor)
+            return IsTransforming;
+        
+        if (feature is IMidChangeUndoableExecutor)
+            return true;
+
+        return false;
+    }
 }

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/SimpleShapeToolExecutor.cs

@@ -1,4 +1,6 @@
-using PixiEditor.Models.Handlers;
+using ChunkyImageLib.DataHolders;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
+using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Tools;
 using PixiEditor.Numerics;
 
@@ -22,7 +24,8 @@ namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
 ///         - Transform -> Preview (when user applies the transform)
 ///         - Transform -> Drawing (when user clicks outside of shape transform bounds)
 /// </summary>
-internal abstract class SimpleShapeToolExecutor : UpdateableChangeExecutor
+internal abstract class SimpleShapeToolExecutor : UpdateableChangeExecutor, 
+    ITransformableExecutor, IMidChangeUndoableExecutor
 {
     private ShapeToolMode activeMode;
 
@@ -134,13 +137,28 @@ internal abstract class SimpleShapeToolExecutor : UpdateableChangeExecutor
         ActiveMode = ShapeToolMode.Transform;
     }
 
-    public override void OnTransformApplied()
+    public bool IsTransforming => ActiveMode == ShapeToolMode.Transform; 
+
+    public virtual void OnTransformMoved(ShapeCorners corners)
+    {
+        
+    }
+
+    public virtual void OnTransformApplied()
     {
         ActiveMode = ShapeToolMode.Preview;
         AddMemberToSnapping();
         HighlightSnapping(null, null);
     }
-    
+
+    public virtual void OnLineOverlayMoved(VecD start, VecD end)
+    {
+    }
+
+    public virtual void OnSelectedObjectNudged(VecI distance)
+    {
+    }
+
     public override void ForceStop()
     {
         StopMode(activeMode);
@@ -187,6 +205,22 @@ internal abstract class SimpleShapeToolExecutor : UpdateableChangeExecutor
     
     protected virtual void PrecisePositionChangeDrawingMode(VecD pos) { }
     protected virtual void PrecisePositionChangeTransformMode(VecD pos) { }
+    public abstract void OnMidChangeUndo();
+    public abstract void OnMidChangeRedo();
+    public bool IsFeatureEnabled(IExecutorFeature feature)
+    {
+        if (feature is ITransformableExecutor)
+        {
+            return IsTransforming;
+        }
+        
+        if (feature is IMidChangeUndoableExecutor)
+        {
+            return ActiveMode == ShapeToolMode.Transform;
+        }
+        
+        return false;
+    }
 }
 
 enum ShapeToolMode

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/TransformReferenceLayerExecutor.cs

@@ -1,11 +1,12 @@
 using ChunkyImageLib.DataHolders;
 using PixiEditor.ChangeableDocument.Actions.Generated;
 using PixiEditor.DrawingApi.Core.Numerics;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Models.Tools;
 using PixiEditor.Numerics;
 
 namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
-internal class TransformReferenceLayerExecutor : UpdateableChangeExecutor
+internal class TransformReferenceLayerExecutor : UpdateableChangeExecutor, ITransformableExecutor
 {
     public override ExecutionState Start()
     {
@@ -19,18 +20,22 @@ internal class TransformReferenceLayerExecutor : UpdateableChangeExecutor
         return ExecutionState.Success;
     }
 
-    public override void OnTransformMoved(ShapeCorners corners)
+    public bool IsTransforming => true;
+
+    public void OnTransformMoved(ShapeCorners corners)
     {
         internals!.ActionAccumulator.AddActions(new TransformReferenceLayer_Action(corners));
     }
 
-    public override void OnSelectedObjectNudged(VecI distance) => document!.TransformHandler.Nudge(distance);
+    public void OnLineOverlayMoved(VecD start, VecD end) { }
+
+    public void OnSelectedObjectNudged(VecI distance) => document!.TransformHandler.Nudge(distance);
 
-    public override void OnMidChangeUndo() => document!.TransformHandler.Undo();
+    public void OnMidChangeUndo() => document!.TransformHandler.Undo();
 
-    public override void OnMidChangeRedo() => document!.TransformHandler.Redo();
+    public void OnMidChangeRedo() => document!.TransformHandler.Redo();
 
-    public override void OnTransformApplied()
+    public void OnTransformApplied()
     {
         internals!.ActionAccumulator.AddFinishedActions(new EndTransformReferenceLayer_Action());
         document!.TransformHandler.HideTransform();
@@ -44,4 +49,9 @@ internal class TransformReferenceLayerExecutor : UpdateableChangeExecutor
         document!.TransformHandler.HideTransform();
         document.ReferenceLayerHandler.IsTransforming = false;
     }
+
+    public bool IsFeatureEnabled(IExecutorFeature feature)
+    {
+        return feature is ITransformableExecutor;
+    }
 }

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/TransformSelectedExecutor.cs

@@ -5,6 +5,7 @@ using PixiEditor.ChangeableDocument.Actions.Generated;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surfaces.Vector;
 using PixiEditor.Models.DocumentModels.Public;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Handlers.Tools;
 using PixiEditor.Models.Tools;
@@ -13,7 +14,7 @@ using PixiEditor.ViewModels.Document.Nodes;
 
 namespace PixiEditor.Models.DocumentModels.UpdateableChangeExecutors;
 #nullable enable
-internal class TransformSelectedExecutor : UpdateableChangeExecutor
+internal class TransformSelectedExecutor : UpdateableChangeExecutor, ITransformableExecutor, IMidChangeUndoableExecutor
 {
     private Dictionary<Guid, ShapeCorners> memberCorners = new();
     private IMoveToolHandler? tool;
@@ -111,7 +112,9 @@ internal class TransformSelectedExecutor : UpdateableChangeExecutor
         }));
     }
 
-    public override void OnTransformMoved(ShapeCorners corners)
+    public bool IsTransforming => isInProgress;
+
+    public void OnTransformMoved(ShapeCorners corners)
     {
         if (!isInProgress)
             return;
@@ -121,13 +124,15 @@ internal class TransformSelectedExecutor : UpdateableChangeExecutor
                 document!.AnimationHandler.ActiveFrameBindable));
     }
 
-    public override void OnSelectedObjectNudged(VecI distance) => document!.TransformHandler.Nudge(distance);
+    public void OnLineOverlayMoved(VecD start, VecD end) { }
+
+    public void OnSelectedObjectNudged(VecI distance) => document!.TransformHandler.Nudge(distance);
 
-    public override void OnMidChangeUndo() => document!.TransformHandler.Undo();
+    public void OnMidChangeUndo() => document!.TransformHandler.Undo();
 
-    public override void OnMidChangeRedo() => document!.TransformHandler.Redo();
+    public void OnMidChangeRedo() => document!.TransformHandler.Redo();
 
-    public override void OnTransformApplied()
+    public void OnTransformApplied()
     {
         if (tool is not null)
         {
@@ -179,4 +184,9 @@ internal class TransformSelectedExecutor : UpdateableChangeExecutor
             }
         }
     }
+
+    public bool IsFeatureEnabled(IExecutorFeature feature)
+    {
+        return feature is ITransformableExecutor && IsTransforming;
+    }
 }

src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/UpdateableChangeExecutor.cs

@@ -22,7 +22,8 @@ internal abstract class UpdateableChangeExecutor
     protected Action<UpdateableChangeExecutor>? onEnded;
     public virtual ExecutorType Type => ExecutorType.Regular;
     public virtual ExecutorStartMode StartMode => ExecutorStartMode.RightAway;
-    public virtual bool BlocksOtherActions => true; 
+    public virtual bool BlocksOtherActions => true;
+    public virtual bool IsUndoable => true;
 
     public void Initialize(IDocument document, DocumentInternalParts internals, IServiceProvider services,
         ChangeExecutionController controller, Action<UpdateableChangeExecutor> onEnded)
@@ -58,13 +59,6 @@ internal abstract class UpdateableChangeExecutor
     public virtual void OnSymmetryDragEnded(SymmetryAxisDirection dir) { }
     public virtual void OnConvertedKeyDown(Key key) { }
     public virtual void OnConvertedKeyUp(Key key) { }
-    public virtual void OnTransformMoved(ShapeCorners corners) { }
-    public virtual void OnTransformApplied() { }
-    public virtual void OnLineOverlayMoved(VecD start, VecD end) { }
-    public virtual void OnMidChangeUndo() { }
-    public virtual void OnMidChangeRedo() { }
-    public virtual void OnSelectedObjectNudged(VecI distance) { }
-
     public virtual void OnSettingsChanged(string name, object value) { }
     public virtual void OnColorChanged(Color color, bool primary) { }
     public virtual void OnMembersSelected(List<Guid> memberGuids) { }

src/PixiEditor/Models/ExceptionHandling/CrashReport.cs

@@ -129,7 +129,7 @@ internal class CrashReport : IDisposable
             .AppendLine($"  MainWindow Size: {GetFormatted(() => MainWindow.Current?.Bounds)}")
             .AppendLine($"  MainWindow State: {GetFormatted(() => MainWindow.Current?.WindowState)}")
             .AppendLine("\nViewModels:")
-            .AppendLine($"  Has active updateable change: {GetFormatted(() => ViewModelMain.Current?.DocumentManagerSubViewModel?.ActiveDocument?.UpdateableChangeActive)}")
+            .AppendLine($"  Has active updateable change: {GetFormatted(() => ViewModelMain.Current?.DocumentManagerSubViewModel?.ActiveDocument?.BlockingUpdateableChangeActive)}")
             .AppendLine($"  Current Tool: {GetFormattedFromViewModelMain(x => x.ToolsSubViewModel?.ActiveTool?.ToolName)}")
             .AppendLine($"  Primary Color: {GetFormattedFromViewModelMain(x => x.ColorsSubViewModel?.PrimaryColor)}")
             .AppendLine($"  Secondary Color: {GetFormattedFromViewModelMain(x => x.ColorsSubViewModel?.SecondaryColor)}")
@@ -180,7 +180,7 @@ internal class CrashReport : IDisposable
             .AppendLine($"  Horizontal Symmetry Value: {FormatObject(document.HorizontalSymmetryAxisYBindable)}")
             .AppendLine($"  Vertical Symmetry Enabled: {document.VerticalSymmetryAxisEnabledBindable}")
             .AppendLine($"  Vertical Symmetry Value: {FormatObject(document.VerticalSymmetryAxisXBindable)}")
-            .AppendLine($"  Updateable Change Active: {FormatObject(document.UpdateableChangeActive)}")
+            .AppendLine($"  Updateable Change Active: {FormatObject(document.BlockingUpdateableChangeActive)}")
             .AppendLine($"  Transform: {FormatObject(document.TransformViewModel)}");
     }
 

src/PixiEditor/ViewModels/Document/AnimationDataViewModel.cs

@@ -34,7 +34,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
         get => _activeFrameBindable;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
 
             Internals.ActionAccumulator.AddActions(new SetActiveFrame_PassthroughAction(value));
@@ -48,7 +48,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
         get => frameRateBindable;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
 
             Internals.ActionAccumulator.AddFinishedActions(new SetFrameRate_Action(value));
@@ -60,7 +60,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
         get => onionSkinningEnabled;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
 
             Internals.ActionAccumulator.AddFinishedActions(new ToggleOnionSkinning_PassthroughAction(value));
@@ -72,7 +72,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
         get => onionFrames;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
 
             Internals.ActionAccumulator.AddFinishedActions(new SetOnionSettings_Action(value, OnionOpacityBindable));
@@ -84,7 +84,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
         get => onionOpacity;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
 
             Internals.ActionAccumulator.AddFinishedActions(new SetOnionSettings_Action(OnionFramesBindable, value)); 
@@ -96,7 +96,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
         get => isPlayingBindable;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
 
             Internals.ActionAccumulator.AddFinishedActions(new SetPlayingState_PassthroughAction(value));
@@ -126,7 +126,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
     public void CreateRasterKeyFrame(Guid targetLayerGuid, int frame, Guid? toCloneFrom = null,
         int? frameToCopyFrom = null)
     {
-        if (!Document.UpdateableChangeActive)
+        if (!Document.BlockingUpdateableChangeActive)
         {
             Internals.ActionAccumulator.AddFinishedActions(new CreateRasterKeyFrame_Action(targetLayerGuid,
                 Guid.NewGuid(), Math.Max(1, frame),
@@ -136,7 +136,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
 
     public void DeleteKeyFrames(List<Guid> keyFrameIds)
     {
-        if (!Document.UpdateableChangeActive)
+        if (!Document.BlockingUpdateableChangeActive)
         {
             for (var i = 0; i < keyFrameIds.Count; i++)
             {
@@ -155,7 +155,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
 
     public void ChangeKeyFramesStartPos(Guid[] infoIds, int infoDelta)
     {
-        if (!Document.UpdateableChangeActive)
+        if (!Document.BlockingUpdateableChangeActive)
         {
             Internals.ActionAccumulator.AddActions(new KeyFramesStartPos_Action(infoIds.ToList(), infoDelta));
         }
@@ -163,7 +163,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
 
     public void ToggleOnionSkinning(bool value)
     {
-        if (!Document.UpdateableChangeActive)
+        if (!Document.BlockingUpdateableChangeActive)
         {
             Internals.ActionAccumulator.AddFinishedActions(new ToggleOnionSkinning_PassthroughAction(value));
         }
@@ -171,7 +171,7 @@ internal class AnimationDataViewModel : ObservableObject, IAnimationHandler
 
     public void EndKeyFramesStartPos()
     {
-        if (!Document.UpdateableChangeActive)
+        if (!Document.BlockingUpdateableChangeActive)
         {
             Internals.ActionAccumulator.AddFinishedActions(new EndKeyFramesStartPos_Action());
         }

src/PixiEditor/ViewModels/Document/DocumentViewModel.cs

@@ -39,6 +39,7 @@ using PixiEditor.Helpers.Extensions;
 using PixiEditor.Models.Controllers;
 using PixiEditor.Models.DocumentModels;
 using PixiEditor.Models.DocumentModels.Public;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Models.Handlers;
 using PixiEditor.Models.Layers;
 using PixiEditor.Models.Serialization;
@@ -152,7 +153,8 @@ internal partial class DocumentViewModel : PixiObservableObject, IDocument
 
     private readonly HashSet<IStructureMemberHandler> softSelectedStructureMembers = new();
 
-    public bool UpdateableChangeActive => Internals.ChangeController.IsBlockingChangeActive;
+    public bool BlockingUpdateableChangeActive => Internals.ChangeController.IsBlockingChangeActive;
+    public bool IsChangeFeatureActive<T>() where T : IExecutorFeature => Internals.ChangeController.IsChangeOfTypeActive<T>();
 
     public bool PointerDragChangeInProgress =>
         Internals.ChangeController.IsBlockingChangeActive && Internals.ChangeController.LeftMousePressed;

src/PixiEditor/ViewModels/Document/KeyFrameViewModel.cs

@@ -43,7 +43,7 @@ internal abstract class KeyFrameViewModel : ObservableObject, IKeyFrameHandler
                 value = 0;
             }
 
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
             {
                 Internals.ActionAccumulator.AddFinishedActions(
                     new KeyFrameLength_Action(Id, value, DurationBindable),
@@ -62,7 +62,7 @@ internal abstract class KeyFrameViewModel : ObservableObject, IKeyFrameHandler
                 value = 1;
             }
 
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
             {
                 Internals.ActionAccumulator.AddFinishedActions(
                     new KeyFrameLength_Action(Id, StartFrameBindable, value),
@@ -76,7 +76,7 @@ internal abstract class KeyFrameViewModel : ObservableObject, IKeyFrameHandler
         get => isVisibleBindable;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
             {
                 Internals.ActionAccumulator.AddFinishedActions(new KeyFrameVisibility_Action(Id, value));
             }

src/PixiEditor/ViewModels/Document/Nodes/ImageLayerNodeViewModel.cs

@@ -19,7 +19,7 @@ internal class ImageLayerNodeViewModel : StructureMemberViewModel<ImageLayerNode
         get => lockTransparency;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
                 Internals.ActionAccumulator.AddFinishedActions(new LayerLockTransparency_Action(Id, value));
         }
     }

src/PixiEditor/ViewModels/Document/Nodes/StructureMemberViewModel.cs

@@ -33,7 +33,7 @@ internal abstract class StructureMemberViewModel<T> : NodeViewModel<T>, IStructu
         get => isVisible;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
                 Internals.ActionAccumulator.AddFinishedActions(new StructureMemberIsVisible_Action(value, Id));
         }
     }
@@ -57,7 +57,7 @@ internal abstract class StructureMemberViewModel<T> : NodeViewModel<T>, IStructu
         get => maskIsVisible;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
                 Internals.ActionAccumulator.AddFinishedActions(
                     new StructureMemberMaskIsVisible_Action(value, Id));
         }
@@ -76,7 +76,7 @@ internal abstract class StructureMemberViewModel<T> : NodeViewModel<T>, IStructu
         get => blendMode;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
                 Internals.ActionAccumulator.AddFinishedActions(new StructureMemberBlendMode_Action(value, Id));
         }
     }
@@ -94,7 +94,7 @@ internal abstract class StructureMemberViewModel<T> : NodeViewModel<T>, IStructu
         get => clipToMemberBelowEnabled;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
                 Internals.ActionAccumulator.AddFinishedActions(
                     new StructureMemberClipToMemberBelow_Action(value, Id));
         }
@@ -126,7 +126,7 @@ internal abstract class StructureMemberViewModel<T> : NodeViewModel<T>, IStructu
         get => opacity;
         set
         {
-            if (Document.UpdateableChangeActive)
+            if (Document.BlockingUpdateableChangeActive)
                 return;
             float newValue = Math.Clamp(value, 0, 1);
             Internals.ActionAccumulator.AddFinishedActions(

src/PixiEditor/ViewModels/Document/Nodes/VectorLayerNodeViewModel.cs

@@ -21,7 +21,7 @@ internal class VectorLayerNodeViewModel : StructureMemberViewModel<VectorLayerNo
         get => lockTransparency;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
                 Internals.ActionAccumulator.AddFinishedActions(new LayerLockTransparency_Action(Id, value));
         }
     }

src/PixiEditor/ViewModels/Document/ReferenceLayerViewModel.cs

@@ -34,7 +34,7 @@ internal class ReferenceLayerViewModel : ObservableObject, IReferenceLayerHandle
         get => referenceShape; 
         set
         {
-            if (!doc.UpdateableChangeActive)
+            if (!doc.BlockingUpdateableChangeActive)
                 internals.ActionAccumulator.AddFinishedActions(new TransformReferenceLayer_Action(value));
         }
     }
@@ -57,7 +57,7 @@ internal class ReferenceLayerViewModel : ObservableObject, IReferenceLayerHandle
         get => isVisible;
         set
         {
-            if (!doc.UpdateableChangeActive)
+            if (!doc.BlockingUpdateableChangeActive)
                 internals.ActionAccumulator.AddFinishedActions(new ReferenceLayerIsVisible_Action(value));
         }
     }
@@ -80,7 +80,7 @@ internal class ReferenceLayerViewModel : ObservableObject, IReferenceLayerHandle
         get => isTopMost;
         set
         {
-            if (!doc.UpdateableChangeActive)
+            if (!doc.BlockingUpdateableChangeActive)
                 internals.ActionAccumulator.AddFinishedActions(new ReferenceLayerTopMost_Action(value));
         }
     }

src/PixiEditor/ViewModels/Nodes/NodeViewModel.cs

@@ -53,7 +53,7 @@ internal abstract class NodeViewModel : ObservableObject, INodeHandler
         get => nodeNameBindable ?? DisplayName;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
             {
                 Internals.ActionAccumulator.AddFinishedActions(
                     new SetNodeName_Action(Id, value));
@@ -89,7 +89,7 @@ internal abstract class NodeViewModel : ObservableObject, INodeHandler
         get => position;
         set
         {
-            if (!Document.UpdateableChangeActive)
+            if (!Document.BlockingUpdateableChangeActive)
             {
                 Internals.ActionAccumulator.AddFinishedActions(
                     new NodePosition_Action(Id, value),

src/PixiEditor/ViewModels/SubViewModels/IoViewModel.cs

@@ -209,7 +209,7 @@ internal class IoViewModel : SubViewModel<ViewModelMain>
         {
             case RightClickMode.SecondaryColor when tools.ActiveTool.UsesColor:
             case RightClickMode.Erase when tools.ActiveTool is ColorPickerToolViewModel:
-                if (!Owner.DocumentManagerSubViewModel.ActiveDocument.UpdateableChangeActive)
+                if (!Owner.DocumentManagerSubViewModel.ActiveDocument.BlockingUpdateableChangeActive)
                 {
                     Owner.ColorsSubViewModel.SwapColors(null);
                 }
@@ -310,7 +310,7 @@ internal class IoViewModel : SubViewModel<ViewModelMain>
                                          }
                                         ):
 
-                if (!Owner.DocumentManagerSubViewModel.ActiveDocument.UpdateableChangeActive)
+                if (!Owner.DocumentManagerSubViewModel.ActiveDocument.BlockingUpdateableChangeActive)
                 {
                     Owner.ColorsSubViewModel.SwapColors(null);
                 }

src/PixiEditor/ViewModels/SubViewModels/LayersViewModel.cs

@@ -137,7 +137,7 @@ internal class LayersViewModel : SubViewModel<ViewModelMain>
     [Evaluator.CanExecute("PixiEditor.Layer.CanCreateNewMember")]
     public bool CanCreateNewMember()
     {
-        return Owner.DocumentManagerSubViewModel.ActiveDocument is { UpdateableChangeActive: false };
+        return Owner.DocumentManagerSubViewModel.ActiveDocument is { BlockingUpdateableChangeActive: false };
     }
 
     [Command.Internal("PixiEditor.Layer.ToggleLockTransparency", CanExecute = "PixiEditor.Layer.SelectedMemberIsLayer",

src/PixiEditor/ViewModels/SubViewModels/SelectionViewModel.cs

@@ -4,6 +4,7 @@ using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Models.Commands.Attributes.Commands;
 using PixiEditor.Models.Commands.Attributes.Evaluators;
+using PixiEditor.Models.DocumentModels.UpdateableChangeExecutors.Features;
 using PixiEditor.Numerics;
 using PixiEditor.UI.Common.Fonts;
 
@@ -104,5 +105,6 @@ internal class SelectionViewModel : SubViewModel<ViewModelMain>
     }
 
     [Evaluator.CanExecute("PixiEditor.Selection.CanNudgeSelectedObject")]
-    public bool CanNudgeSelectedObject(int[] dist) => Owner.DocumentManagerSubViewModel.ActiveDocument?.UpdateableChangeActive == true;
+    public bool CanNudgeSelectedObject(int[] dist) => Owner.DocumentManagerSubViewModel.ActiveDocument
+        ?.IsChangeFeatureActive<ITransformableExecutor>() ?? false;
 }

src/PixiEditor/ViewModels/SubViewModels/UndoViewModel.cs

@@ -21,7 +21,7 @@ internal class UndoViewModel : SubViewModel<ViewModelMain>
     public void Redo()
     {
         var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
-        if (doc is null || (!doc.UpdateableChangeActive && !doc.HasSavedRedo))
+        if (doc is null || (!doc.BlockingUpdateableChangeActive && !doc.HasSavedRedo))
             return;
         doc.Operations.Redo();
     }
@@ -34,7 +34,7 @@ internal class UndoViewModel : SubViewModel<ViewModelMain>
     public void Undo()
     {
         var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
-        if (doc is null || (!doc.UpdateableChangeActive && !doc.HasSavedUndo))
+        if (doc is null || (!doc.BlockingUpdateableChangeActive && !doc.HasSavedUndo))
             return;
         doc.Operations.Undo();
     }
@@ -50,7 +50,7 @@ internal class UndoViewModel : SubViewModel<ViewModelMain>
         var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
         if (doc is null)
             return false;
-        return doc.UpdateableChangeActive || doc.HasSavedUndo;
+        return doc.BlockingUpdateableChangeActive || doc.HasSavedUndo;
     }
 
     /// <summary>
@@ -64,6 +64,6 @@ internal class UndoViewModel : SubViewModel<ViewModelMain>
         var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;
         if (doc is null)
             return false;
-        return doc.UpdateableChangeActive || doc.HasSavedRedo;
+        return doc.BlockingUpdateableChangeActive || doc.HasSavedRedo;
     }
 }