瀏覽代碼

Increased max zoom scale in zoombox

flabbet 2 年之前
父節點
當前提交
aafc8cf27e

+ 12 - 2
src/PixiEditor.Zoombox/Zoombox.xaml.cs

@@ -132,7 +132,7 @@ public partial class Zoombox : ContentControl, INotifyPropertyChanged
     public double FlipTransformX => FlipX ? -1 : 1;
     public double FlipTransformY => FlipY ? -1 : 1;
     public double RotateTransformAngle => Angle * 180 / Math.PI;
-    internal const double MaxScale = 70;
+    internal const double MaxScale = 384;
 
     internal double MinScale
     {
@@ -232,7 +232,17 @@ public partial class Zoombox : ContentControl, INotifyPropertyChanged
             40,
             48,
             56,
-            64
+            64,
+            80,
+            96,
+            112,
+            128,
+            160,
+            192,
+            224,
+            256,
+            320,
+            384,
         };
         List<double> interpolatedValues = new();
         for (int i = 0; i < roundZoomValues.Length - 1; i++)

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

@@ -203,6 +203,7 @@ internal class ToolsViewModel : SubViewModel<ViewModelMain>
 
     public void HandleToolRepeatShortcutDown()
     {
+        if(ActiveTool == null) return;
         if (ActiveTool is null or { IsTransient: false })
         {
             ShortcutController.BlockShortcutExecution("ShortcutDown");
@@ -212,6 +213,7 @@ internal class ToolsViewModel : SubViewModel<ViewModelMain>
     
     public void HandleToolShortcutUp()
     {
+        if(ActiveTool == null) return;
         if (ActiveTool.IsTransient && LastActionTool is { } tool)
             SetActiveTool(tool, false);
         ShortcutController.UnblockShortcutExecution("ShortcutDown");