Improved look of Apply Transform

src/PixiEditor/Models/Commands/XAML/ContextMenu.cs

@@ -35,7 +35,7 @@ internal class ContextMenu : global::Avalonia.Controls.ContextMenu
         var command = CommandController.Current.Commands[value];
 
         item.Command = Command.GetICommand(command, false);
-        item.Bind(MenuItem.InputGestureProperty, ShortcutBinding.GetBinding(command, null));
+        item.Bind(MenuItem.InputGestureProperty, ShortcutBinding.GetBinding(command, null, true));
     }
 
     private static void HandleDesignMode(MenuItem item, string name)

src/PixiEditor/Models/Commands/XAML/Menu.cs

@@ -51,7 +51,7 @@ internal class Menu : global::Avalonia.Controls.Menu
 
         item.Command = Command.GetICommand(command, false);
         item.Icon = icon;
-        item.Bind(MenuItem.InputGestureProperty, ShortcutBinding.GetBinding(command, null));
+        item.Bind(MenuItem.InputGestureProperty, ShortcutBinding.GetBinding(command, null, true));
     }
 
     private static void HandleDesignMode(MenuItem item, string name)

src/PixiEditor/Models/Commands/XAML/ShortcutBinding.cs

@@ -15,6 +15,8 @@ internal class ShortcutBinding : MarkupExtension
     private static CommandController commandController;
 
     public string Name { get; set; }
+    
+    public bool UseAvaloniaGesture { get; set; } = true;
 
     public IValueConverter Converter { get; set; }
     
@@ -32,7 +34,7 @@ internal class ShortcutBinding : MarkupExtension
 
         ICommandsHandler? handler = ViewModelMain.Current;
         commandController ??= handler.CommandController;
-        return GetBinding(commandController.Commands[Name], Converter);
+        return GetBinding(commandController.Commands[Name], Converter, UseAvaloniaGesture);
 
         /*var targetValue = serviceProvider.GetService<IProvideValueTarget>();
         var targetObject = targetValue.TargetObject as AvaloniaObject;
@@ -43,10 +45,10 @@ internal class ShortcutBinding : MarkupExtension
         return instancedBinding; //TODO: This won't work, leaving it for now*/
     }
 
-    public static Binding GetBinding(Commands.Command command, IValueConverter converter) => new Binding
+    public static Binding GetBinding(ActualCommand command, IValueConverter converter, bool useAvaloniaGesture) => new Binding
     {
         Source = command,
-        Path = new("Shortcut.Gesture"),
+        Path = useAvaloniaGesture ? "Shortcut.Gesture" : "Shortcut",
         Mode = BindingMode.OneWay,
         StringFormat = "",
         Converter = converter

src/PixiEditor/Views/Main/ViewportControls/Viewport.axaml

@@ -208,9 +208,9 @@
             </Button.IsVisible>
             <StackPanel Orientation="Horizontal">
                 <TextBlock ui:Translator.Key="APPLY_TRANSFORM" VerticalAlignment="Center" Margin="0,0,5,0" />
-                <Border Padding="10,3" CornerRadius="5" Background="{DynamicResource ThemeAccentBrush}"
+                <Border Padding="10,3" CornerRadius="5" Background="{DynamicResource ThemeControlLowBrush}"
                         IsVisible="{xaml:ShortcutBinding PixiEditor.Tools.ApplyTransform, Converter={converters:NotNullToVisibilityConverter}}">
-                    <TextBlock Text="{xaml:ShortcutBinding PixiEditor.Tools.ApplyTransform}" />
+                    <TextBlock Text="{xaml:ShortcutBinding PixiEditor.Tools.ApplyTransform, UseAvaloniaGesture=False}" />
                 </Border>
             </StackPanel>
         </Button>