Merge pull request #105 from DHancock/Dev

Use correct theme colors in MenuFlyouts
DHancock · Aug 31, 2023 · 519e409 · 519e409
2 parents 8859f84 + d4840c9
commit 519e409
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Countdown/Views/LettersView.xaml b/Countdown/Views/LettersView.xaml
@@ -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"/>

diff --git a/Countdown/Views/NumbersView.xaml b/Countdown/Views/NumbersView.xaml
@@ -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"/>