Adding back previous name for content padding for Flyout (#3962)

* adding back previous name for contentpadding * adding back previous name for contentpadding * static * user/tatito/flyout-padding * reverting back to (incorrect, but existing in generic) theme resource, also, adding test flyout to common styles page as it's a local change at the moment
microsoft · Jan 20, 2021 · ee45abd · ee45abd
1 parent 9818540
commit ee45abd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/dev/CommonStyles/FlyoutPresenter_themeresources.xaml b/dev/CommonStyles/FlyoutPresenter_themeresources.xaml
@@ -23,8 +23,6 @@
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Thickness x:Key="FlyoutContentPadding">12</Thickness>
-
     <Style TargetType="FlyoutPresenter" BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" />
 
     <Style x:Key="DefaultFlyoutPresenterStyle" TargetType="FlyoutPresenter">
@@ -34,7 +32,7 @@
         <Setter Property="Background" Value="{ThemeResource FlyoutPresenterBackground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource FlyoutBorderThemeBrush}" />
         <Setter Property="BorderThickness" Value="{ThemeResource FlyoutBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{ThemeResource FlyoutContentPadding}" />
+        <Setter Property="Padding" Value="{ThemeResource FlyoutContentThemePadding}" />
         <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
         <Setter Property="MaxWidth" Value="{ThemeResource FlyoutThemeMaxWidth}" />
         <Setter Property="MinHeight" Value="{ThemeResource FlyoutThemeMinHeight}" />

diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml b/dev/CommonStyles/TestUI/CommonStylesPage.xaml
@@ -225,6 +225,17 @@
                     <!-- Checking that the DefaultRadioButtonStyle can be accessed as resource -->
                     <RadioButton Style="{StaticResource DefaultRadioButtonStyle}" Content="I am a RadioButton with DefaultRadioButtonStyle set" />
 
+                    <Button Content="Test flyout">
+                        <Button.Flyout>
+                            <Flyout>
+                                <StackPanel>
+                                    <TextBlock Style="{ThemeResource BaseTextBlockStyle}" Text="All items will be removed. Do you want to continue?" Margin="0,0,0,12" />
+                                    <Button Content="Yes, empty my cart" />
+                                </StackPanel>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+
                 </StackPanel>
                 <StackPanel Style="{ThemeResource CompactPanelStyle}">
                     <TextBlock  Text="Miscellaneous testing area" Style="{ThemeResource StandardGroupHeader}"/>