Browse Source

Removed keyboard focus from toolbar settings

flabbet 8 months ago
parent
commit
0b1b214eed

+ 13 - 4
src/PixiEditor/Views/Input/ToolSettingColorPicker.axaml.cs

@@ -1,25 +1,34 @@
 using Avalonia;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
 using Avalonia.Media;
 using Avalonia.Media;
 using Avalonia.Threading;
 using Avalonia.Threading;
+using Avalonia.VisualTree;
+using PixiEditor.Helpers.Behaviours;
 
 
 namespace PixiEditor.Views.Input;
 namespace PixiEditor.Views.Input;
 
 
 internal partial class ToolSettingColorPicker : UserControl
 internal partial class ToolSettingColorPicker : UserControl
 {
 {
-    public static readonly StyledProperty<Color> SelectedColorProperty = AvaloniaProperty.Register<ToolSettingColorPicker, Color>(
-        nameof(SelectedColor));
+    public static readonly StyledProperty<Color> SelectedColorProperty =
+        AvaloniaProperty.Register<ToolSettingColorPicker, Color>(
+            nameof(SelectedColor));
 
 
     public Color SelectedColor
     public Color SelectedColor
     {
     {
         get => GetValue(SelectedColorProperty);
         get => GetValue(SelectedColorProperty);
         set => SetValue(SelectedColorProperty, value);
         set => SetValue(SelectedColorProperty, value);
     }
     }
-    
+
     public ToolSettingColorPicker()
     public ToolSettingColorPicker()
     {
     {
         InitializeComponent();
         InitializeComponent();
         ColorPicker.SecondaryColor = Colors.Black;
         ColorPicker.SecondaryColor = Colors.Black;
+        ColorPicker.TemplateApplied += ColorPickerOnTemplateApplied;
     }
     }
-}
 
 
+    private void ColorPickerOnTemplateApplied(object? sender, TemplateAppliedEventArgs e)
+    {
+        ColorPicker.FindDescendantOfType<ToggleButton>().Focusable = false;
+    }
+}

+ 1 - 1
src/PixiEditor/Views/Tools/ToolSettings/Settings/BoolSettingView.axaml

@@ -9,5 +9,5 @@
         <settings:BoolSettingViewModel/>
         <settings:BoolSettingViewModel/>
     </Design.DataContext>
     </Design.DataContext>
     
     
-    <CheckBox VerticalAlignment="Center" IsChecked="{Binding Value, Mode=TwoWay}"/>
+    <CheckBox VerticalAlignment="Center" Focusable="False" IsChecked="{Binding Value, Mode=TwoWay}"/>
 </UserControl>
 </UserControl>

+ 1 - 0
src/PixiEditor/Views/Tools/ToolSettings/Settings/FloatSettingView.axaml

@@ -14,5 +14,6 @@
                        Min="{Binding Min}"
                        Min="{Binding Min}"
                        Max="{Binding Max}"
                        Max="{Binding Max}"
                        Margin="0,0,0,0" 
                        Margin="0,0,0,0" 
+                       FocusNext="False"
                        Width="40" />
                        Width="40" />
 </UserControl>
 </UserControl>