AppBarToggleButton: missing stroke on toggled state (#5018)

microsoft · Jun 1, 2021 · f068430 · f068430
1 parent a51bc73
commit f068430
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1,345 deletions.
diff --git a/dev/CommonStyles/AppBarToggleButton_themeresources.xaml b/dev/CommonStyles/AppBarToggleButton_themeresources.xaml
@@ -203,6 +203,7 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <Thickness x:Key="AppBarToggleButtonBorderThemeThickness">1</Thickness>
     <Thickness x:Key="AppBarToggleButtonOverflowTextTouchMargin">0,9,0,12</Thickness>
     <Thickness x:Key="AppBarToggleButtonOverflowCheckTouchMargin">12,10,12,10</Thickness>
     <Thickness x:Key="AppBarToggleButtonOverflowCheckMargin">12,4,12,4</Thickness>
@@ -222,6 +223,7 @@
         <Setter Property="Background" Value="{ThemeResource AppBarToggleButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource AppBarToggleButtonForeground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource AppBarToggleButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource AppBarToggleButtonBorderThemeThickness}" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />

diff --git a/test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius-7.xml b/test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius-7.xml
@@ -174,7 +174,7 @@
                 [Windows.UI.Xaml.Controls.AppBarToggleButton]
                     Padding=0,0,0,0
                     Foreground=#E4000000
-                    BorderThickness=0,0,0,0
+                    BorderThickness=1,1,1,1
                     BorderBrush=#00FFFFFF
                     Background=#00FFFFFF
                     CornerRadius=4,4,4,4
@@ -203,7 +203,7 @@
                     [Windows.UI.Xaml.Controls.Border]
                         Padding=0,0,0,0
                         CornerRadius=4,4,4,4
-                        BorderThickness=0,0,0,0
+                        BorderThickness=1,1,1,1
                         BorderBrush=#00FFFFFF
                         Background=#00FFFFFF
                         Name=AppBarToggleButtonInnerBorder
@@ -348,7 +348,7 @@
                 [Windows.UI.Xaml.Controls.AppBarToggleButton]
                     Padding=0,0,0,0
                     Foreground=#E4000000
-                    BorderThickness=0,0,0,0
+                    BorderThickness=1,1,1,1
                     BorderBrush=#00FFFFFF
                     Background=#00FFFFFF
                     CornerRadius=4,4,4,4
@@ -377,7 +377,7 @@
                     [Windows.UI.Xaml.Controls.Border]
                         Padding=0,0,0,0
                         CornerRadius=4,4,4,4
-                        BorderThickness=0,0,0,0
+                        BorderThickness=1,1,1,1
                         BorderBrush=#00FFFFFF
                         Background=#00FFFFFF
                         Name=AppBarToggleButtonInnerBorder
@@ -834,7 +834,7 @@
                 [Windows.UI.Xaml.Controls.AppBarToggleButton]
                     Padding=0,0,0,0
                     Foreground=#E4000000
-                    BorderThickness=0,0,0,0
+                    BorderThickness=1,1,1,1
                     BorderBrush=#00FFFFFF
                     Background=#00FFFFFF
                     CornerRadius=4,4,4,4
@@ -863,7 +863,7 @@
                     [Windows.UI.Xaml.Controls.Border]
                         Padding=0,0,0,0
                         CornerRadius=4,4,4,4
-                        BorderThickness=0,0,0,0
+                        BorderThickness=1,1,1,1
                         BorderBrush=#00FFFFFF
                         Background=#00FFFFFF
                         Name=AppBarToggleButtonInnerBorder
@@ -1008,7 +1008,7 @@
                 [Windows.UI.Xaml.Controls.AppBarToggleButton]
                     Padding=0,0,0,0
                     Foreground=#E4000000
-                    BorderThickness=0,0,0,0
+                    BorderThickness=1,1,1,1
                     BorderBrush=#00FFFFFF
                     Background=#00FFFFFF
                     CornerRadius=4,4,4,4
@@ -1037,7 +1037,7 @@
                     [Windows.UI.Xaml.Controls.Border]
                         Padding=0,0,0,0
                         CornerRadius=4,4,4,4
-                        BorderThickness=0,0,0,0
+                        BorderThickness=1,1,1,1
                         BorderBrush=#00FFFFFF
                         Background=#00FFFFFF
                         Name=AppBarToggleButtonInnerBorder