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.

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

Use correct theme colors in MenuFlyouts #105

Merged
merged 1 commit into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Countdown/Views/LettersView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@
<SplitButton Content="Choose" Command="{x:Bind ViewModel.ChooseLettersCommand}">
<SplitButton.Flyout>
<MenuFlyout Opening="{x:Bind local:LettersView.MenuFlyout_Opening}">
<MenuFlyout.MenuFlyoutPresenterStyle>
<Style TargetType="MenuFlyoutPresenter" BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}">
<Setter Property="Background" Value="{ThemeResource FlyoutPresenterBackground}"/>
<Setter Property="BorderBrush" Value="{ThemeResource FlyoutBorderThemeBrush}"/>
</Style>
</MenuFlyout.MenuFlyoutPresenterStyle>

<RadioMenuFlyoutItem Text="3 vowels and 6 consonants" CommandParameter="0" Command="{x:Bind ViewModel.ChooseOptionCommand}" AccessKey="3"/>
<RadioMenuFlyoutItem Text="4 vowels and 5 consonants" CommandParameter="1" Command="{x:Bind ViewModel.ChooseOptionCommand}" AccessKey="4"/>
<RadioMenuFlyoutItem Text="5 vowels and 4 consonants" CommandParameter="2" Command="{x:Bind ViewModel.ChooseOptionCommand}" AccessKey="5"/>
Expand Down
7 changes: 7 additions & 0 deletions Countdown/Views/NumbersView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
<SplitButton Grid.Column="0" Content="Choose" Command="{x:Bind ViewModel.ChooseNumbersCommand}">
<SplitButton.Flyout>
<MenuFlyout Opening="{x:Bind local:NumbersView.MenuFlyout_Opening}">
<MenuFlyout.MenuFlyoutPresenterStyle>
<Style TargetType="MenuFlyoutPresenter" BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}">
<Setter Property="Background" Value="{ThemeResource FlyoutPresenterBackground}"/>
<Setter Property="BorderBrush" Value="{ThemeResource FlyoutBorderThemeBrush}"/>
</Style>
</MenuFlyout.MenuFlyoutPresenterStyle>

<RadioMenuFlyoutItem Text="6 small tiles" CommandParameter="0" Command="{x:Bind ViewModel.ChooseOptionCommand}" AccessKey="6"/>
<RadioMenuFlyoutItem Text="1 large and 5 small tiles" CommandParameter="1" Command="{x:Bind ViewModel.ChooseOptionCommand}" AccessKey="1"/>
<RadioMenuFlyoutItem Text="2 large and 4 small tiles" CommandParameter="2" Command="{x:Bind ViewModel.ChooseOptionCommand}" AccessKey="2"/>
Expand Down