Browse Source

Remove focus from some ui elements

Krzysztof Krysiński 3 months ago
parent
commit
78d5ef754e

+ 6 - 0
src/PixiEditor/Views/Layers/LayersManager.axaml

@@ -35,6 +35,7 @@
                     Height="24" Width="24" Cursor="Hand" uiExt:Translator.TooltipKey="NEW_LAYER"
                     Height="24" Width="24" Cursor="Hand" uiExt:Translator.TooltipKey="NEW_LAYER"
                     HorizontalAlignment="Stretch" Margin="0,0,5,0"
                     HorizontalAlignment="Stretch" Margin="0,0,5,0"
                     Classes="pixi-icon"
                     Classes="pixi-icon"
+                    Focusable="False"
                     Content="{DynamicResource icon-file-plus}"
                     Content="{DynamicResource icon-file-plus}"
                     FlowDirection="LeftToRight"/>
                     FlowDirection="LeftToRight"/>
                 <Button 
                 <Button 
@@ -43,6 +44,7 @@
                     DockPanel.Dock="Left"
                     DockPanel.Dock="Left"
                     HorizontalAlignment="Stretch"  Margin="0,0,5,0"
                     HorizontalAlignment="Stretch"  Margin="0,0,5,0"
                     Classes="pixi-icon"
                     Classes="pixi-icon"
+                    Focusable="False"
                     Content="{DynamicResource icon-folder-plus}"
                     Content="{DynamicResource icon-folder-plus}"
                     FlowDirection="LeftToRight"/>
                     FlowDirection="LeftToRight"/>
                 <Button 
                 <Button 
@@ -51,6 +53,7 @@
                     HorizontalAlignment="Stretch" Margin="0,0,5,0"
                     HorizontalAlignment="Stretch" Margin="0,0,5,0"
                     DockPanel.Dock="Left"
                     DockPanel.Dock="Left"
                     Classes="pixi-icon"
                     Classes="pixi-icon"
+                    Focusable="False"
                     Content="{DynamicResource icon-trash}"
                     Content="{DynamicResource icon-trash}"
                     FlowDirection="LeftToRight"/>
                     FlowDirection="LeftToRight"/>
                 <Button 
                 <Button 
@@ -58,6 +61,7 @@
                     DockPanel.Dock="Right"
                     DockPanel.Dock="Right"
                     HorizontalAlignment="Stretch" Margin="5,0,0,0"
                     HorizontalAlignment="Stretch" Margin="5,0,0,0"
                     Classes="pixi-icon"
                     Classes="pixi-icon"
+                    Focusable="False"
                     Content="{DynamicResource icon-merge}"
                     Content="{DynamicResource icon-merge}"
                     FlowDirection="LeftToRight"/>
                     FlowDirection="LeftToRight"/>
                 <Button 
                 <Button 
@@ -65,6 +69,7 @@
                     DockPanel.Dock="Right"
                     DockPanel.Dock="Right"
                     HorizontalAlignment="Stretch" Margin="5,0,0,0"
                     HorizontalAlignment="Stretch" Margin="5,0,0,0"
                     Classes="pixi-icon"
                     Classes="pixi-icon"
+                    Focusable="False"
                     Content="{DynamicResource icon-create-mask}"
                     Content="{DynamicResource icon-create-mask}"
                     Command="{xaml:Command PixiEditor.Layer.CreateMask}"
                     Command="{xaml:Command PixiEditor.Layer.CreateMask}"
                     FlowDirection="LeftToRight"/>
                     FlowDirection="LeftToRight"/>
@@ -73,6 +78,7 @@
                     DockPanel.Dock="Right"
                     DockPanel.Dock="Right"
                     HorizontalAlignment="Stretch" Margin="5,0,0,0"
                     HorizontalAlignment="Stretch" Margin="5,0,0,0"
                     Classes="pixi-icon"
                     Classes="pixi-icon"
+                    Focusable="False"
                     Content="{DynamicResource icon-alpha-lock}"
                     Content="{DynamicResource icon-alpha-lock}"
                     Command="{xaml:Command PixiEditor.Layer.ToggleLockTransparency}"
                     Command="{xaml:Command PixiEditor.Layer.ToggleLockTransparency}"
                     FlowDirection="LeftToRight"/>
                     FlowDirection="LeftToRight"/>

+ 1 - 0
src/PixiEditor/Views/Main/Tools/ToolPickerButton.axaml

@@ -16,6 +16,7 @@
     </Design.DataContext>
     </Design.DataContext>
     <Button Command="{xaml:Command PixiEditor.Tools.SelectTool, UseProvided=true}"
     <Button Command="{xaml:Command PixiEditor.Tools.SelectTool, UseProvided=true}"
             CommandParameter="{Binding}"
             CommandParameter="{Binding}"
+            Focusable="False"
             Width="44" Height="34"
             Width="44" Height="34"
             ui:Translator.TooltipLocalizedString="{Binding Tooltip}"
             ui:Translator.TooltipLocalizedString="{Binding Tooltip}"
             Background="{DynamicResource ThemeBackgroundBrush1}">
             Background="{DynamicResource ThemeBackgroundBrush1}">