Browse Source

Fixed toggle menu items icons

CPKreuz 2 years ago
parent
commit
ae17f4089b
2 changed files with 21 additions and 5 deletions
  1. 3 1
      src/PixiEditor/Models/Commands/XAML/Menu.cs
  2. 18 4
      src/PixiEditor/Views/MainWindow.xaml

+ 3 - 1
src/PixiEditor/Models/Commands/XAML/Menu.cs

@@ -16,6 +16,8 @@ internal class Menu : System.Windows.Controls.Menu
             new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender, CommandChanged)
         );
 
+    public const double IconDimensions = 21;
+    
     public static string GetCommand(UIElement target) => (string)target.GetValue(CommandNameProperty);
 
     public static void SetCommand(UIElement target, string value) => target.SetValue(CommandNameProperty, value);
@@ -38,7 +40,7 @@ internal class Menu : System.Windows.Controls.Menu
         var icon = new Image 
         { 
             Source = command.GetIcon(), 
-            Width = 21, Height = 21,
+            Width = IconDimensions, Height = IconDimensions,
             Opacity = command.CanExecute() ? 1 : 0.75
         };
         

+ 18 - 4
src/PixiEditor/Views/MainWindow.xaml

@@ -295,13 +295,22 @@
                             IsCheckable="True"
                             IsEnabled="{Binding DocumentManagerSubViewModel.ActiveDocument, Source={vm:MainVM}, Converter={converters:NotNullToBoolConverter}}"
                             IsChecked="{Binding DocumentManagerSubViewModel.ActiveDocument.HorizontalSymmetryAxisEnabledBindable}"
-                            views:Translator.Key="HORIZONTAL_LINE_SYMMETRY"
-                            />
+                            views:Translator.Key="HORIZONTAL_LINE_SYMMETRY">
+                            <MenuItem.Icon>
+                                <Image Source="../Images/SymmetryHorizontal.png"
+                                       Width="{x:Static cmds:Menu.IconDimensions}" Height="{x:Static cmds:Menu.IconDimensions}"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
                         <MenuItem
                             IsCheckable="True"
                             IsEnabled="{Binding DocumentManagerSubViewModel.ActiveDocument, Source={vm:MainVM}, Converter={converters:NotNullToBoolConverter}}"
                             IsChecked="{Binding DocumentManagerSubViewModel.ActiveDocument.VerticalSymmetryAxisEnabledBindable}"
-                            views:Translator.Key="VERTICAL_LINE_SYMMETRY"/>
+                            views:Translator.Key="VERTICAL_LINE_SYMMETRY">
+                            <MenuItem.Icon>
+                                <Image Source="../Images/SymmetryVertical.png"
+                                       Width="{x:Static cmds:Menu.IconDimensions}" Height="{x:Static cmds:Menu.IconDimensions}"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
                         <Separator/>
                         <MenuItem views:Translator.Key="ROTATION">
                             <MenuItem views:Translator.Key="ROT_IMG_90_D" cmds:Menu.Command="PixiEditor.Document.Rotate90Deg"/>
@@ -342,7 +351,12 @@
                             views:Translator.Key="TOGGLE_GRIDLINES"
                             IsChecked="{Binding ViewportSubViewModel.GridLinesEnabled, Mode=TwoWay}"
                             IsCheckable="True"
-                            InputGestureText="{cmds:ShortcutBinding PixiEditor.View.ToggleGrid}" />
+                            InputGestureText="{cmds:ShortcutBinding PixiEditor.View.ToggleGrid}">
+                            <MenuItem.Icon>
+                                <Image Source="../Images/Commands/PixiEditor/View/ToggleGrid.png"
+                                       Width="{x:Static cmds:Menu.IconDimensions}" Height="{x:Static cmds:Menu.IconDimensions}"/>
+                            </MenuItem.Icon>
+                        </MenuItem>
                     </MenuItem>
                     <MenuItem
                         Focusable="False"