Fix focus style.

Author: krisdb2009

SuperLauncher/ModernLauncherContextMenu.xaml

@@ -34,7 +34,7 @@
     </WindowChrome.WindowChrome>
     <Grid Background="{DynamicResource PanelColorBrush}">
         <Grid x:Name="Grid" Background="{DynamicResource AcrylicNoise}">
-            <Frame Opacity="0" x:Name="Frame" Margin="3,3,3,3" />
+            <Frame Focusable="False" Opacity="0" x:Name="Frame" Margin="3,3,3,3" />
         </Grid>
     </Grid>
 </Window>

SuperLauncher/ModernLauncherContextMenuMain.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:SuperLauncher"
       x:Class="SuperLauncher.ModernLauncherContextMenuMain"
-      mc:Ignorable="d" 
+      mc:Ignorable="d"
       Loaded="Page_Loaded" 
       Unloaded="Page_Unloaded" >
     <Page.Resources>

SuperLauncher/Themes/Controls/WinUIButton.xaml

@@ -1,21 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- FocusVisual -->
-    <Style x:Key="ButtonFocusVisual">
-        <Setter Property="Control.Template">
-            <Setter.Value>
-                <ControlTemplate>
-                    <Border>
-                        <Rectangle Margin="2" StrokeThickness="1" Stroke="#60000000" StrokeDashArray="1 2" />
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <!-- Button -->
     <Style TargetType="Button">
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource GenericFocusVisual}" />
         <Setter Property="MinHeight" Value="16" />
         <Setter Property="MinWidth" Value="16" />
         <Setter Property="Foreground" Value="{DynamicResource TextColorBrush}" />

SuperLauncher/Themes/Controls/WinUICheckBox.xaml

@@ -3,6 +3,7 @@
         <Setter Property="SnapsToDevicePixels" Value="true" />
         <Setter Property="OverridesDefaultStyle" Value="true" />
         <Setter Property="Foreground" Value="{DynamicResource TextColorBrush}" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource GenericFocusVisual}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">

SuperLauncher/Themes/Controls/WinUIControl.xaml

@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="GenericFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border>
+                        <Rectangle RadiusX="5" RadiusY="5" Margin="-3" StrokeThickness="2" Stroke="{DynamicResource AccentColorBrush}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

SuperLauncher/Themes/WinUI.xaml

@@ -36,6 +36,7 @@
     <FontFamily x:Key="Font">/Resources/#Segoe UI</FontFamily>
     <FontFamily x:Key="SLIcons">/Resources/#Super Launcher Icons</FontFamily>
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/Themes/Controls/WinUIControl.xaml" />
         <ResourceDictionary Source="/Themes/Controls/WinUIScrollBar.xaml" />
         <ResourceDictionary Source="/Themes/Controls/WinUITextBox.xaml" />
         <ResourceDictionary Source="/Themes/Controls/WinUIButton.xaml" />