Browse Source

Removed move all layers

flabbet 6 months ago
parent
commit
4919c6bb81

+ 0 - 1
src/PixiEditor/Data/Localization/Languages/en.json

@@ -493,7 +493,6 @@
   "RESET_VIEWPORT": "Reset viewport",
   "VIEWPORT_SETTINGS": "Viewport settings",
   "MOVE_TOOL_ACTION_DISPLAY_TRANSFORMING": "Click and hold mouse to move pixels in selected layers.",
-  "MOVE_TOOL_ACTION_DISPLAY_CTRL": "Hold mouse to move all layers.",
   "CTRL_KEY": "Ctrl",
   "SHIFT_KEY": "Shift",
   "ALT_KEY": "Alt",

+ 10 - 14
src/PixiEditor/Models/DocumentModels/UpdateableChangeExecutors/ShiftLayerExecutor.cs

@@ -20,27 +20,22 @@ internal class ShiftLayerExecutor : UpdateableChangeExecutor
     public override ExecutionState Start()
     {
         IStructureMemberHandler? member = document!.SelectedStructureMember;
-        
+
         tool = GetHandler<IMoveToolHandler>();
         if (tool is null)
             return ExecutionState.Error;
 
-        if (tool.MoveAllLayers)
-        {
-            _affectedMemberGuids.AddRange(document.StructureHelper.GetAllLayers().Select(x => x.Id));
-        }
-        else
-        {
-            if (member != null)
-                _affectedMemberGuids.Add(member.Id);
-            _affectedMemberGuids.AddRange(document!.SoftSelectedStructureMembers.Select(x => x.Id));
-        }
+
+        if (member != null)
+            _affectedMemberGuids.Add(member.Id);
+        _affectedMemberGuids.AddRange(document!.SoftSelectedStructureMembers.Select(x => x.Id));
 
         RemoveDrawOnMaskLayers(_affectedMemberGuids);
-        
+
         startPos = controller!.LastPixelPosition;
 
-        ShiftLayer_Action action = new(_affectedMemberGuids, VecI.Zero, tool.KeepOriginalImage, document!.AnimationHandler.ActiveFrameBindable);
+        ShiftLayer_Action action = new(_affectedMemberGuids, VecI.Zero, tool.KeepOriginalImage,
+            document!.AnimationHandler.ActiveFrameBindable);
         internals!.ActionAccumulator.AddActions(action);
 
         return ExecutionState.Success;
@@ -61,7 +56,8 @@ internal class ShiftLayerExecutor : UpdateableChangeExecutor
 
     public override void OnPixelPositionChange(VecI pos)
     {
-        ShiftLayer_Action action = new(_affectedMemberGuids, pos - startPos, tool!.KeepOriginalImage, document!.AnimationHandler.ActiveFrameBindable);
+        ShiftLayer_Action action = new(_affectedMemberGuids, pos - startPos, tool!.KeepOriginalImage,
+            document!.AnimationHandler.ActiveFrameBindable);
         internals!.ActionAccumulator.AddActions(action);
     }
 

+ 0 - 1
src/PixiEditor/Models/Handlers/Tools/IMoveToolHandler.cs

@@ -2,7 +2,6 @@
 
 internal interface IMoveToolHandler : IToolHandler
 {
-    public bool MoveAllLayers { get; }
     public bool KeepOriginalImage { get; }
     public bool TransformingSelectedArea { get; set; }
 }

+ 13 - 17
src/PixiEditor/ViewModels/Tools/Tools/MoveToolViewModel.cs

@@ -21,7 +21,6 @@ internal class MoveToolViewModel : ToolViewModel, IMoveToolHandler
 
     private string transformingActionDisplay = "MOVE_TOOL_ACTION_DISPLAY_TRANSFORMING";
     private bool transformingSelectedArea = false;
-    public bool MoveAllLayers { get; set; }
 
     public override string DefaultIcon => PixiPerfectIcons.MousePointer;
 
@@ -35,7 +34,13 @@ internal class MoveToolViewModel : ToolViewModel, IMoveToolHandler
     public override LocalizedString Tooltip => new LocalizedString("MOVE_TOOL_TOOLTIP", Shortcut);
 
     [Settings.Bool("KEEP_ORIGINAL_IMAGE_SETTING", Notify = nameof(KeepOriginalChanged))]
-    public bool KeepOriginalImage => GetValue<bool>();
+    public bool KeepOriginalImage
+    {
+        get
+        {
+            return GetValue<bool>();
+        }
+    }
 
     public override BrushShape BrushShape => BrushShape.Hidden;
     public override Type[]? SupportedLayerTypes { get; } = null;
@@ -59,21 +64,7 @@ internal class MoveToolViewModel : ToolViewModel, IMoveToolHandler
 
     public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
     {
-        if (TransformingSelectedArea)
-        {
-            return;
-        }
-
-        if (ctrlIsDown)
-        {
-            ActionDisplay = new LocalizedString("MOVE_TOOL_ACTION_DISPLAY_CTRL");
-            MoveAllLayers = true;
-        }
-        else
-        {
-            ActionDisplay = defaultActionDisplay;
-            MoveAllLayers = false;
-        }
+        
     }
 
     protected override void OnSelected(bool restoring)
@@ -131,6 +122,11 @@ internal class MoveToolViewModel : ToolViewModel, IMoveToolHandler
     public void KeepOriginalChanged()
     {
         var activeDocument = ViewModelMain.Current.DocumentManagerSubViewModel.ActiveDocument;
+        if (activeDocument is null)
+        {
+            return;
+        }
+        
         activeDocument.TransformViewModel.ShowTransformControls = KeepOriginalImage;
     }
 }