Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AppBarToggleButton: missing stroke on toggled state #5018

Merged
merged 3 commits into from
Jun 1, 2021
Merged

AppBarToggleButton: missing stroke on toggled state #5018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de6d59f
AppBarToggleButton: missing stroke on toggled state
kimsealls May 14, 2021
c71d2f4
Merge remote-tracking branch 'upstream/main' into user/kimsea/AppBarT…
kimsealls May 26, 2021
808e747
Updated visual verification files
kimsealls May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dev/CommonStyles/AppBarToggleButton_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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}" />
Expand Down
16 changes: 8 additions & 8 deletions test/MUXControlsTestApp/verification/VerifyVisualTreeForCommandBarCornerRadius-7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading