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

[SplitButton] Add missing SplitButton disabled state and resource bindings #6138

Merged
merged 3 commits into from
Oct 26, 2021
Merged

[SplitButton] Add missing SplitButton disabled state and resource bindings #6138

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bef578
Add missing splitbutton disabled state and resource bindings
marcelwgn Oct 21, 2021
74d61b1
Fix colors
marcelwgn Oct 25, 2021
e8640e6
Fix border brushes
marcelwgn Oct 25, 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
5 changes: 4 additions & 1 deletion dev/SplitButton/SplitButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ void SplitButton::UpdateVisualStates(bool useTransitions)
// change visual state
auto primaryButton = m_primaryButton.get();
auto secondaryButton = m_secondaryButton.get();
if (primaryButton && secondaryButton)
if (!IsEnabled()) {
winrt::VisualStateManager::GoToState(*this, L"Disabled", useTransitions);
}
else if (primaryButton && secondaryButton)
{
if (m_isFlyoutOpen)
{
Expand Down
7 changes: 7 additions & 0 deletions dev/SplitButton/SplitButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource SplitButtonForegroundDisabled}"/>
<Setter Target="RootGrid.Background" Value="{ThemeResource SplitButtonBackgroundDisabled}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -92,6 +93,12 @@
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/>

<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushDisabled}"/>
</VisualState.Setters>
</VisualState>

<VisualState x:Name="FlyoutOpen">
<VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundPressed}"/>
Expand Down
7 changes: 7 additions & 0 deletions dev/SplitButton/SplitButton_rs1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource SplitButtonForegroundDisabled}"/>
<Setter Target="RootGrid.Background" Value="{ThemeResource SplitButtonBackgroundDisabled}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand All @@ -81,6 +82,12 @@
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/>

<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushDisabled}"/>
</VisualState.Setters>
</VisualState>

<VisualState x:Name="FlyoutOpen">
<VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundPressed}"/>
Expand Down
7 changes: 7 additions & 0 deletions dev/SplitButton/SplitButton_rs1_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource SplitButtonForegroundDisabled}"/>
<Setter Target="RootGrid.Background" Value="{ThemeResource SplitButtonForegroundDisabled}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand All @@ -81,6 +82,12 @@
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/>

<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushDisabled}"/>
</VisualState.Setters>
</VisualState>

<VisualState x:Name="FlyoutOpen">
<VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundPressed}"/>
Expand Down
7 changes: 7 additions & 0 deletions dev/SplitButton/SplitButton_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource AppBarButtonForegroundDisabled}"/>
<Setter Target="RootGrid.Background" Value="{ThemeResource AppBarButtonBackgroundDisabled}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand All @@ -194,6 +195,12 @@
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/>

<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource AppBarButtonBorderBrushDisabled}"/>
</VisualState.Setters>
</VisualState>

<VisualState x:Name="FlyoutOpen">
<VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource AppBarButtonBackgroundPressed}"/>
Expand Down
7 changes: 7 additions & 0 deletions dev/SplitButton/SplitButton_v1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource SplitButtonForegroundDisabled}"/>
<Setter Target="RootGrid.Background" Value="{ThemeResource SplitButtonBackgroundDisabled}"/>
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand All @@ -81,6 +82,12 @@
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal"/>

<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="Border.BorderBrush" Value="{ThemeResource SplitButtonBorderBrushDisabled}"/>
</VisualState.Setters>
</VisualState>

<VisualState x:Name="FlyoutOpen">
<VisualState.Setters>
<Setter Target="PrimaryBackgroundGrid.Background" Value="{ThemeResource SplitButtonBackgroundPressed}"/>
Expand Down