Enable shadow by default for ContentDialog

Kinnara · Mar 27, 2020 · ce3698c · ce3698c
1 parent 7fc8d4c
commit ce3698c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ModernWpf.Controls/ContentDialog/ContentDialog.xaml b/ModernWpf.Controls/ContentDialog/ContentDialog.xaml
@@ -17,6 +17,7 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="IsShadowEnabled" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ContentDialog">
@@ -26,6 +27,9 @@
                                 <VisualStateGroup.Transitions>
                                     <VisualTransition To="DialogHidden" GeneratedDuration="0:0:0.5">
                                         <Storyboard>
+                                            <BooleanAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="SnapsToDevicePixels">
+                                                <DiscreteBooleanKeyFrame KeyTime="0:0:0" Value="False" />
+                                            </BooleanAnimationUsingKeyFrames>
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>
@@ -48,6 +52,9 @@
                                     </VisualTransition>
                                     <VisualTransition To="DialogShowing" GeneratedDuration="0:0:0.5">
                                         <Storyboard>
+                                            <BooleanAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="SnapsToDevicePixels">
+                                                <DiscreteBooleanKeyFrame KeyTime="0:0:0" Value="False" />
+                                            </BooleanAnimationUsingKeyFrames>
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
                                             </ObjectAnimationUsingKeyFrames>

diff --git a/ModernWpf.SampleApp/ControlPages/ContentDialogExample.xaml b/ModernWpf.SampleApp/ControlPages/ContentDialogExample.xaml
@@ -7,8 +7,7 @@
     PrimaryButtonText="Save"
     SecondaryButtonText="Don't Save"
     CloseButtonText="Cancel"
-    DefaultButton="Primary"
-    IsShadowEnabled="{DynamicResource {x:Static SystemParameters.DropShadowKey}}">
+    DefaultButton="Primary">
 
     <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <!-- Content body -->

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