improve focus visuals

toggle switch
command bar

Author: mou-haz

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/CommandBar/CommandBar.xaml

@@ -48,6 +48,7 @@
                                     -->
                                     <ContentControl
                                         x:Name="ContentControl"
+                                        Margin="{TemplateBinding Padding}"
                                         HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -76,14 +77,15 @@
                                     IsChecked="{Binding Path=IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                     IsEnabled="{TemplateBinding HasOverflowItems}"
                                     Style="{DynamicResource EllipsisButton}"
+                                    ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                                     Visibility="{TemplateBinding EffectiveOverflowButtonVisibility}">
                                     <ui:FontIcon
                                         x:Name="EllipsisIcon"
                                         Height="{DynamicResource AppBarExpandButtonCircleDiameter}"
                                         VerticalAlignment="Center"
-                                        FontFamily="{DynamicResource FluentSystemIcons}"
+                                        FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                         FontSize="20"
-                                        Glyph="&#xE826;" />
+                                        Glyph="&#xE712;" />
                                 </ToggleButton>
                                 <Rectangle
                                     x:Name="HighContrastBorder"
@@ -129,6 +131,7 @@
                                             </primitives:CommandBarOverflowPresenter.Resources>
                                             <primitives:CommandBarOverflowPanel
                                                 x:Name="PART_ToolBarOverflowPanel"
+                                                Margin="{DynamicResource CommandBarOverflowPresenterMargin}"
                                                 FocusVisualStyle="{x:Null}"
                                                 Focusable="true"
                                                 KeyboardNavigation.DirectionalNavigation="Cycle"
@@ -210,7 +213,6 @@
                         SnapsToDevicePixels="True">
                         <Border Padding="{TemplateBinding Padding}" CornerRadius="{TemplateBinding CornerRadius}">
                             <ui:ScrollViewerEx
-                                Padding="{DynamicResource CommandBarOverflowPresenterMargin}"
                                 Content="{TemplateBinding Content}"
                                 HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ToggleSwitch/ToggleSwitch.xaml

@@ -124,6 +124,8 @@
                                 Visibility="Collapsed" />
                             <Grid
                                 Grid.Row="1"
+                                ui:FocusVisualHelper.IsTemplateFocusTarget="True"
+                                ui:ControlHelper.CornerRadius="{TemplateBinding CornerRadius}" 
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top">
 
@@ -145,7 +147,6 @@
                                     Grid.RowSpan="3"
                                     Grid.ColumnSpan="5"
                                     Margin="0,5"
-                                    ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                                     Background="{DynamicResource ToggleSwitchContainerBackground}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
                                 <ui:ContentPresenterEx

source/iNKORE.UI.WPF.Modern/Controls/Helpers/FocusVisualHelper.cs

@@ -483,6 +483,7 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
                     }
                     else
                     {
+                        TransferValue(focusedElement, focusVisual, ControlHelper.CornerRadiusProperty); 
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryBrushProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryThicknessProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualSecondaryBrushProperty);
@@ -533,13 +534,13 @@ public FocusVisualAdorner(Control focusedElement, UIElement adornedElement, Styl
                 control.Style = focusVisualStyle;
                 control.Margin = GetFocusVisualMargin(focusedElement);
 
-                ControlHelper.SetCornerRadius(control, ControlHelper.GetCornerRadius(focusedElement));
+                TransferValue(focusedElement, control, ControlHelper.CornerRadiusProperty);
                 TransferValue(focusedElement, control, FocusVisualPrimaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualPrimaryThicknessProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryThicknessProperty);
                 _adorderChild = control;
-                IsClipEnabled = true;
+                IsClipEnabled = false;
                 IsHitTestVisible = false;
                 IsEnabled = false;
                 AddVisualChild(_adorderChild);