Jelajahi Sumber

Probably fixed flip image and flip selected icons

CPKreuz 1 tahun lalu
induk
melakukan
283eee74cd

+ 2 - 2
src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/WindowViewModel.cs

@@ -71,7 +71,7 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
     }
     
     [Command.Basic("PixiEditor.Window.FlipHorizontally", "FLIP_VIEWPORT_HORIZONTALLY", "FLIP_VIEWPORT_HORIZONTALLY", CanExecute = "PixiEditor.HasDocument",
-        Icon = PixiPerfectIcons.XFlip)]
+        Icon = PixiPerfectIcons.YFlip)]
     public void FlipViewportHorizontally()
     {
         if (ActiveWindow is ViewportWindowViewModel viewport)
@@ -81,7 +81,7 @@ internal class WindowViewModel : SubViewModel<ViewModelMain>
     }
     
     [Command.Basic("PixiEditor.Window.FlipVertically", "FLIP_VIEWPORT_VERTICALLY", "FLIP_VIEWPORT_VERTICALLY", CanExecute = "PixiEditor.HasDocument",
-        Icon = PixiPerfectIcons.YFlip)]
+        Icon = PixiPerfectIcons.XFlip)]
     public void FlipViewportVertically()
     {
         if (ActiveWindow is ViewportWindowViewModel viewport)

+ 2 - 2
src/PixiEditor.AvaloniaUI/Views/Main/ViewportControls/Viewport.axaml

@@ -85,13 +85,13 @@
                             <ToggleButton Width="32" Height="32" ui:Translator.TooltipKey="FLIP_VIEWPORT_HORIZONTALLY"
                                           Classes="OverlayToggleButton pixi-icon"
                                           IsChecked="{Binding FlipX, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=viewportControls:Viewport}, Mode=TwoWay}"
-                                          Content="{DynamicResource icon-x-flip}"
+                                          Content="{DynamicResource icon-y-flip}"
                                           Cursor="Hand"/>
                             <ToggleButton Margin="10 0 0 0" Width="32" Height="32"
                                           ui:Translator.TooltipKey="FLIP_VIEWPORT_VERTICALLY"
                                           Classes="OverlayToggleButton pixi-icon"
                                           IsChecked="{Binding FlipY, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=viewportControls:Viewport}, Mode=TwoWay}"
-                                            Content="{DynamicResource icon-y-flip}"
+                                            Content="{DynamicResource icon-x-flip}"
                                           Cursor="Hand"/>
                         </StackPanel>
                     </StackPanel>

+ 4 - 4
src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml

@@ -99,11 +99,11 @@
             <system:String x:Key="icon-trash">&#xE958;</system:String>
             <system:String x:Key="icon-undo">&#xE959;</system:String>
             <system:String x:Key="icon-unlock">&#xE95A;</system:String>
-            <system:String x:Key="icon-y-flip">&#xE95B;</system:String>
-            <system:String x:Key="icon-x-selected-flip">&#xE95C;</system:String>
+            <system:String x:Key="icon-x-flip">&#xE95B;</system:String>
+            <system:String x:Key="icon-x-selected-flip">&#xE95F;</system:String>
+            <system:String x:Key="icon-y-flip">&#xE95E;</system:String>
+            <system:String x:Key="icon-y-selected-flip">&#xE95C;</system:String>
             <system:String x:Key="icon-x-symmetry">&#xE95D;</system:String>
-            <system:String x:Key="icon-x-flip">&#xE95E;</system:String>
-            <system:String x:Key="icon-y-selected-flip">&#xE95F;</system:String>
             <system:String x:Key="icon-y-symmetry">&#xE960;</system:String>
             <system:String x:Key="icon-zoom-in">&#xE961;</system:String>
             <system:String x:Key="icon-zoom-out">&#xE962;</system:String>

+ 4 - 4
src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml.cs

@@ -102,11 +102,11 @@ public static class PixiPerfectIcons
     public const string Trash = "\uE958";
     public const string Undo = "\uE959";
     public const string Unlock = "\uE95A";
-    public const string XFlip = "\uE95B";
-    public const string XSelectedFlip = "\uE95C";
+    public const string XFlip = "\uE95E";
+    public const string XSelectedFlip = "\uE95F";
     public const string XSymmetry = "\uE95D";
-    public const string YFlip = "\uE95E";
-    public const string YSelectedFlip = "\uE95F";
+    public const string YFlip = "\uE95B";
+    public const string YSelectedFlip = "\uE95C";
     public const string YSymmetry = "\uE960";
     public const string ZoomIn = "\uE961";
     public const string ZoomOut = "\uE962";