Clicking on dialog shadow now dismisses dialog (#2290)

Keboo · web-flow · commit a12e00b8da09 · 2021-03-25T23:19:16.000-07:00
* Clicking on dialog shadow now dismisses dialog Fixes #2279 * Fixing issue where Dialog wasn't hit testable.
diff --git a/MaterialDesignThemes.Wpf/Converters/ShadowConverter.cs b/MaterialDesignThemes.Wpf/Converters/ShadowConverter.cs
@@ -7,7 +7,7 @@ namespace MaterialDesignThemes.Wpf.Converters
 {
     public class ShadowConverter : IValueConverter
     {
-        public static readonly ShadowConverter Instance = new ShadowConverter();
+        public static readonly ShadowConverter Instance = new();
 
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
@@ -22,9 +22,7 @@ public class ShadowConverter : IValueConverter
             => throw new NotImplementedException();
 
         public static DropShadowEffect? Convert(ShadowDepth shadowDepth)
-        {
-            return ShadowInfo.GetDropShadow(shadowDepth);
-        }
+            => ShadowInfo.GetDropShadow(shadowDepth);
 
         private static DropShadowEffect? Clone(DropShadowEffect? dropShadowEffect)
         {
diff --git a/MaterialDesignThemes.Wpf/Converters/ShadowInfo.cs b/MaterialDesignThemes.Wpf/Converters/ShadowInfo.cs
@@ -25,8 +25,6 @@ static ShadowInfo()
         }
 
         public static DropShadowEffect? GetDropShadow(ShadowDepth depth)
-        {
-            return ShadowsDictionary[depth];
-        }
+            => ShadowsDictionary[depth];
     }
 }
diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml
@@ -142,33 +142,44 @@
                                      x:Name="PART_Popup" 
                                      Style="{TemplateBinding PopupStyle}"
                                      wpf:ThemeAssist.Theme="{TemplateBinding DialogTheme}">
-                            <wpf:Card x:Name="PART_PopupContentElement" 
-                                        Margin="{TemplateBinding DialogMargin}"
-                                        wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth)}"
-                                        UniformCornerRadius="4"
-                                        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-                                        TextElement.FontWeight="Regular"
-                                        TextElement.FontSize="13"
-                                        TextOptions.TextFormattingMode="Ideal"
-                                        TextOptions.TextRenderingMode="Auto" 
-                                        FocusManager.IsFocusScope="False"
-                                        Foreground="{DynamicResource MaterialDesignBody}"
-                                        Focusable="True"
-                                        IsTabStop="False"
-                                        Opacity="0"
-                                        RenderTransformOrigin=".5,.5"
-                                        Content="{TemplateBinding DialogContent}"
-                                        ContentTemplate="{TemplateBinding DialogContentTemplate}"
-                                        ContentTemplateSelector="{TemplateBinding DialogContentTemplateSelector}"
-                                        ContentStringFormat="{TemplateBinding DialogContentStringFormat}">
-                                <wpf:Card.RenderTransform>
-                                    <TransformGroup>
-                                        <ScaleTransform x:Name="CardScaleTransform"
+                            <Grid>
+                                <Border Background="Transparent" IsHitTestVisible="{TemplateBinding CloseOnClickAway}">
+                                    <Border.InputBindings>
+                                        <MouseBinding MouseAction="LeftClick"
+                                                  Command="{x:Static wpf:DialogHost.CloseDialogCommand}"
+                                                  CommandParameter="{TemplateBinding CloseOnClickAwayParameter}"
+                                                  />
+                                    </Border.InputBindings>
+                                </Border>
+                                <wpf:Card x:Name="PART_PopupContentElement" 
+                                          Margin="{TemplateBinding DialogMargin}"
+                                          wpf:ShadowAssist.ShadowDepth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth)}"
+                                          UniformCornerRadius="4"
+                                          TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+                                          TextElement.FontWeight="Regular"
+                                          TextElement.FontSize="13"
+                                          TextOptions.TextFormattingMode="Ideal"
+                                          TextOptions.TextRenderingMode="Auto" 
+                                          FocusManager.IsFocusScope="False"
+                                          Foreground="{DynamicResource MaterialDesignBody}"
+                                          Focusable="True"
+                                          IsTabStop="False"
+                                          IsHitTestVisible="True"
+                                          Opacity="0"
+                                          RenderTransformOrigin=".5,.5"
+                                          Content="{TemplateBinding DialogContent}"
+                                          ContentTemplate="{TemplateBinding DialogContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding DialogContentTemplateSelector}"
+                                          ContentStringFormat="{TemplateBinding DialogContentStringFormat}">
+                                    <wpf:Card.RenderTransform>
+                                        <TransformGroup>
+                                            <ScaleTransform x:Name="CardScaleTransform"
                                                         ScaleX="0"
                                                         ScaleY="0" />
-                                    </TransformGroup>
-                                </wpf:Card.RenderTransform>
-                            </wpf:Card>
+                                        </TransformGroup>
+                                    </wpf:Card.RenderTransform>
+                                </wpf:Card>
+                            </Grid>
                         </wpf:PopupEx>
                         <AdornerDecorator>
                             <ContentPresenter x:Name="ContentPresenter" Opacity="1" Content="{TemplateBinding ContentControl.Content}" 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace MaterialDesignThemes.Wpf.Converters`
`7`	`7`	`{`
`8`	`8`	`public class ShadowConverter : IValueConverter`
`9`	`9`	`{`
`10`		`- public static readonly ShadowConverter Instance = new ShadowConverter();`
	`10`	`+ public static readonly ShadowConverter Instance = new();`
`11`	`11`
`12`	`12`	`public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)`
`13`	`13`	`{`
`@@ -22,9 +22,7 @@ public class ShadowConverter : IValueConverter`
`22`	`22`	`=> throw new NotImplementedException();`
`23`	`23`
`24`	`24`	`public static DropShadowEffect? Convert(ShadowDepth shadowDepth)`
`25`		`- {`
`26`		`- return ShadowInfo.GetDropShadow(shadowDepth);`
`27`		`- }`
	`25`	`+ => ShadowInfo.GetDropShadow(shadowDepth);`
`28`	`26`
`29`	`27`	`private static DropShadowEffect? Clone(DropShadowEffect? dropShadowEffect)`
`30`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ static ShadowInfo()`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public static DropShadowEffect? GetDropShadow(ShadowDepth depth)`
`28`		`- {`
`29`		`- return ShadowsDictionary[depth];`
`30`		`- }`
	`28`	`+ => ShadowsDictionary[depth];`
`31`	`29`	`}`
`32`	`30`	`}`