Skip to content

fix: Wrap focus related states in a FocusStates vsg #1526

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

Merged
merged 1 commit into from
Mar 21, 2025
Merged

fix: Wrap focus related states in a FocusStates vsg #1526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 33 additions & 4 deletions src/library/Uno.Material/Styles/Controls/v2/Button.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,9 @@
<Setter Target="ElevatedView.Elevation" Value="{ThemeResource ElevatedButtonElevationDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="Root.Background" Value="{ThemeResource ElevatedButtonBackgroundFocused}" />
Expand All @@ -480,6 +482,8 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource ElevatedButtonBorderBrushPointerFocused}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Unfocused" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

Expand Down Expand Up @@ -596,6 +600,10 @@
</VisualState.Setters>
</VisualState>


</VisualStateGroup>

<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="Root.Background" Value="{ThemeResource FilledButtonBackgroundFocused}" />
Expand All @@ -615,6 +623,8 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource FilledButtonBorderBrushPointerFocused}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Unfocused" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

Expand Down Expand Up @@ -730,7 +740,9 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource FilledTonalButtonBorderBrushDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="Root.Background" Value="{ThemeResource FilledTonalButtonBackgroundFocused}" />
Expand All @@ -750,6 +762,8 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource FilledTonalButtonBorderBrushPointerFocused}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Unfocused" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

Expand Down Expand Up @@ -867,7 +881,9 @@
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource OutlinedButtonForegroundDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="Root.Background" Value="{ThemeResource OutlinedButtonBackgroundFocused}" />
Expand All @@ -887,6 +903,8 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource OutlinedButtonBorderBrushPointerFocused}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Unfocused" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

Expand Down Expand Up @@ -995,7 +1013,9 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource TextButtonBorderBrushDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="Root.Background" Value="{ThemeResource TextButtonBackgroundFocused}" />
Expand All @@ -1015,6 +1035,8 @@
<Setter Target="Root.BorderBrush" Value="{ThemeResource TextButtonBorderBrushPointerFocused}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Unfocused" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

Expand Down Expand Up @@ -1096,16 +1118,23 @@
<Setter Target="PressedOverlay.Opacity" Value="{ThemeResource IconButtonOpacityVisibleState}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Focused">
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="FocusedOverlay.Opacity" Value="{ThemeResource IconButtonOpacityVisibleState}" />
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconButtonForegroundDisabled}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Disabled">
</VisualStateGroup>

<VisualStateGroup x:Name="FocusStates">
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource IconButtonForegroundDisabled}" />
<Setter Target="FocusedOverlay.Opacity" Value="{ThemeResource IconButtonOpacityVisibleState}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="PointerFocused" />

<VisualState x:Name="Unfocused" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

Expand Down
Loading