2
0
Эх сурвалжийг харах

Fix tool change applying transform

Equbuxu 2 жил өмнө
parent
commit
558ca5b175

+ 0 - 1
src/PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs

@@ -131,7 +131,6 @@ internal class ToolsViewModel : SubViewModel<ViewModelMain>
 
         //update old tool
         LastActionTool?.UpdateActionDisplay(false, false, false);
-        LastActionTool?.OnDeselected();
         //update new tool
         ActiveTool.UpdateActionDisplay(ctrlIsDown, shiftIsDown, altIsDown);
         ActiveTool.OnSelected();

+ 0 - 5
src/PixiEditor/ViewModels/SubViewModels/Tools/ShapeTool.cs

@@ -12,9 +12,4 @@ internal abstract class ShapeTool : ToolViewModel
         Cursor = Cursors.Cross;
         Toolbar = new BasicShapeToolbar();
     }
-
-    public override void OnDeselected()
-    {
-        ViewModelMain.Current.DocumentManagerSubViewModel.ActiveDocument?.Operations.TryStopToolLinkedExecutor();
-    }
 }

+ 4 - 2
src/PixiEditor/ViewModels/SubViewModels/Tools/ToolViewModel.cs

@@ -55,8 +55,10 @@ internal abstract class ToolViewModel : NotifyableObject
 
     public virtual void UpdateActionDisplay(bool ctrlIsDown, bool shiftIsDown, bool altIsDown) { }
     public virtual void OnLeftMouseButtonDown(VecD pos) { }
-    public virtual void OnSelected() { }
-    public virtual void OnDeselected() { }
+    public virtual void OnSelected() 
+    {
+        ViewModelMain.Current.DocumentManagerSubViewModel.ActiveDocument?.Operations.TryStopToolLinkedExecutor();
+    }
 
     protected T GetValue<T>([CallerMemberName] string name = null)
     {

+ 0 - 5
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveToolViewModel.cs

@@ -36,9 +36,4 @@ internal class MoveToolViewModel : ToolViewModel
     {
         ViewModelMain.Current.DocumentManagerSubViewModel.ActiveDocument?.Operations.TransformSelectedArea(true);
     }
-
-    public override void OnDeselected()
-    {
-        ViewModelMain.Current.DocumentManagerSubViewModel.ActiveDocument?.Operations.TryStopToolLinkedExecutor();
-    }
 }

+ 5 - 3
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/MoveViewportToolViewModel.cs

@@ -7,13 +7,15 @@ namespace PixiEditor.ViewModels.SubViewModels.Tools.Tools;
 [Command.Tool(Key = Key.H, Transient = Key.Space)]
 internal class MoveViewportToolViewModel : ToolViewModel
 {
+    public override BrushShape BrushShape => BrushShape.Hidden;
+    public override bool HideHighlight => true;
+    public override string Tooltip => $"Moves viewport. ({Shortcut})";
+
     public MoveViewportToolViewModel()
     {
         Cursor = Cursors.SizeAll;
         ActionDisplay = "Click and move to pan viewport.";
     }
 
-    public override BrushShape BrushShape => BrushShape.Hidden;
-    public override bool HideHighlight => true;
-    public override string Tooltip => $"Moves viewport. ({Shortcut})";
+    public override void OnSelected() { }
 }

+ 3 - 3
src/PixiEditor/ViewModels/SubViewModels/Tools/Tools/RotateViewportToolViewModel.cs

@@ -13,13 +13,13 @@ namespace PixiEditor.ViewModels.SubViewModels.Tools.Tools;
 internal class RotateViewportToolViewModel : ToolViewModel
 {
     public override BrushShape BrushShape => BrushShape.Hidden;
+    public override bool HideHighlight => true;
+    public override string Tooltip => $"Rotates viewport ({Shortcut})";
 
     public RotateViewportToolViewModel()
     {
         ActionDisplay = "Rotate viewport";
     }
 
-    public override bool HideHighlight => true;
-
-    public override string Tooltip => $"Rotates viewport ({Shortcut})";
+    public override void OnSelected() { }
 }