Use command icons in main menu

PixiEditor · Apr 28, 2023 · c09c493 · c09c493
1 parent 6d1bbc7
commit c09c493
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/PixiEditor/Models/Commands/XAML/Menu.cs b/src/PixiEditor/Models/Commands/XAML/Menu.cs
@@ -35,7 +35,23 @@ public static void CommandChanged(object sender, DependencyPropertyChangedEventA
 
         var command = CommandController.Current.Commands[value];
 
+        var icon = new Image 
+        { 
+            Source = command.GetIcon(), 
+            Width = 20, Height = 20,
+            Opacity = command.CanExecute() ? 1 : 0.75
+        };
+
+        icon.IsVisibleChanged += (_, v) =>
+        {
+            if ((bool)v.NewValue)
+            {
+                icon.Opacity = command.CanExecute() ? 1 : 0.75;
+            }
+        };
+
         item.Command = Command.GetICommand(command, false);
+        item.Icon = icon;
         item.SetBinding(MenuItem.InputGestureTextProperty, ShortcutBinding.GetBinding(command));
     }
 

diff --git a/src/PixiEditor/Styles/MenuButtonStyle.xaml b/src/PixiEditor/Styles/MenuButtonStyle.xaml
@@ -27,13 +27,13 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type MenuItem}">
-                    <Border x:Name="Border" Padding="2.5"
+                    <Border x:Name="Border" Padding="2.5,1,2.5,1"
                             Background="Transparent"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="0">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="Col0" MinWidth="17" Width="Auto"
+                                <ColumnDefinition x:Name="Col0" Width="Auto" MinWidth="5"
                                                   SharedSizeGroup="MenuItemIconColumnGroup" />
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="MenuTextColumnGroup" />
                                 <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup" />