Tweak ContentDialog style to match the design

Kinnara · Mar 27, 2020 · 32c64f1 · 32c64f1
1 parent d835e29
commit 32c64f1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/ModernWpf.Controls/ContentDialog/ContentDialog.xaml b/ModernWpf.Controls/ContentDialog/ContentDialog.xaml
@@ -265,7 +265,6 @@
                                 </Grid.RenderTransform>
                                 <ui:ThemeShadowChrome
                                     x:Name="Shdw"
-                                    Depth="64"
                                     IsShadowEnabled="{TemplateBinding IsShadowEnabled}"
                                     Margin="{DynamicResource ContentDialogBorderWidth}"
                                     CornerRadius="{TemplateBinding CornerRadius}" />

diff --git a/ModernWpf.SampleApp/ControlPages/ContentDialogExample.xaml b/ModernWpf.SampleApp/ControlPages/ContentDialogExample.xaml
@@ -6,16 +6,14 @@
     Title="Save your work?"
     PrimaryButtonText="Save"
     SecondaryButtonText="Don't Save"
-    DefaultButton="Secondary">
+    CloseButtonText="Cancel"
+    DefaultButton="Primary"
+    IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
 
-    <StackPanel
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch">
+    <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <!-- Content body -->
-        <TextBlock
-            Text="Lorem ipsum dolor sit amet, adipisicing elit."
-            TextWrapping="Wrap" />
-        <CheckBox Content="Upload your content to the cloud." />
+        <TextBlock Text="Lorem ipsum dolor sit amet, adipisicing elit." TextWrapping="Wrap" />
+        <CheckBox Content="Upload your content to the cloud."/>
     </StackPanel>
 
 </ui:ContentDialog>
diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
@@ -558,7 +558,7 @@
     <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
     <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
     <m:StaticResource x:Key="ContentDialogForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
-    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlPageBackgroundAltHighBrush" />
     <m:StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <m:StaticResource x:Key="ContentDialogLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <SolidColorBrush x:Key="ContentDialogShadowBackground" Color="#5C000000" />

diff --git a/ModernWpf/ThemeResources/HighContrast.xaml b/ModernWpf/ThemeResources/HighContrast.xaml
@@ -559,7 +559,7 @@
     <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
     <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
     <m:StaticResource x:Key="ContentDialogForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
-    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlPageBackgroundAltHighBrush" />
     <m:StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <m:StaticResource x:Key="ContentDialogLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <SolidColorBrush x:Key="ContentDialogShadowBackground" Color="#5C000000" />

diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
@@ -558,7 +558,7 @@
     <Thickness x:Key="ContentDialogTitleMargin">0,0,0,12</Thickness>
     <Thickness x:Key="ContentDialogPadding">24,18,24,24</Thickness>
     <m:StaticResource x:Key="ContentDialogForeground" ResourceKey="SystemControlPageTextBaseHighBrush" />
-    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
+    <m:StaticResource x:Key="ContentDialogBackground" ResourceKey="SystemControlPageBackgroundAltHighBrush" />
     <m:StaticResource x:Key="ContentDialogBorderBrush" ResourceKey="SystemControlBackgroundBaseLowBrush" />
     <m:StaticResource x:Key="ContentDialogLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
     <SolidColorBrush x:Key="ContentDialogShadowBackground" Color="#5C000000" />

diff --git a/samples/FluentRibbonSample/MainWindow.xaml.cs b/samples/FluentRibbonSample/MainWindow.xaml.cs
@@ -34,8 +34,9 @@ private async void ShowContentDialog(object sender, RoutedEventArgs e)
                 PrimaryButtonText = "Yes",
                 SecondaryButtonText = "No",
                 CloseButtonText = "Cancel",
-                DefaultButton = ContentDialogButton.Primary
+                DefaultButton = ContentDialogButton.Primary,
             };
+            dialog.SetResourceReference(ContentDialog.IsShadowEnabledProperty, SystemParameters.DropShadowKey);
             await dialog.ShowAsync();
         }
     }