fixed a bug of Dialog

NaBian · NaBian · commit 2a89bf42f738 · 2020-05-18T23:04:35.000+08:00
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml
@@ -9,7 +9,7 @@
              Background="{DynamicResource RegionBrush}"
              MinWidth="500"
              DataContext="{Binding DialogDemo,Source={StaticResource Locator}}">
-    <AdornerDecorator>
+    <hc:DialogContainer>
         <hc:TransitioningContentControl>
             <hc:SimplePanel>
                 <StackPanel Margin="32" VerticalAlignment="Center">
@@ -22,5 +22,5 @@
                 </StackPanel>
             </hc:SimplePanel>
         </hc:TransitioningContentControl>
-    </AdornerDecorator>
+    </hc:DialogContainer>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
@@ -14,7 +14,7 @@ public class Dialog : ContentControl
     {
         private string _token;
 
-        private Adorner _container;
+        private AdornerContainer _container;
 
         private static readonly Dictionary<string, FrameworkElement> ContainerDic = new Dictionary<string, FrameworkElement>();
 
@@ -107,35 +107,36 @@ public static Dialog Show(object content, string token = "")
 
             FrameworkElement element;
 
+            AdornerDecorator decorator;
             if (string.IsNullOrEmpty(token))
             {
                 element = WindowHelper.GetActiveWindow();
+                decorator = VisualHelper.GetChild<AdornerDecorator>(element);
             }
             else
             {
                 ContainerDic.TryGetValue(token, out element);
+                decorator = element is System.Windows.Window ? 
+                    VisualHelper.GetChild<AdornerDecorator>(element) : 
+                    VisualHelper.GetChild<DialogContainer>(element);
             }
 
-            if (element != null)
+            if (decorator != null)
             {
-                var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
-                if (decorator != null)
+                if (decorator.Child != null)
                 {
-                    if (decorator.Child != null)
-                    {
-                        decorator.Child.IsEnabled = false;
-                    }
-                    var layer = decorator.AdornerLayer;
-                    if (layer != null)
+                    decorator.Child.IsEnabled = false;
+                }
+                var layer = decorator.AdornerLayer;
+                if (layer != null)
+                {
+                    var container = new AdornerContainer(layer)
                     {
-                        var container = new AdornerContainer(layer)
-                        {
-                            Child = dialog
-                        };
-                        dialog._container = container;
-                        dialog.IsClosed = false;
-                        layer.Add(container);
-                    }
+                        Child = dialog
+                    };
+                    dialog._container = container;
+                    dialog.IsClosed = false;
+                    layer.Add(container);
                 }
             }
 
@@ -156,7 +157,7 @@ public void Close()
 
         private void Close(DependencyObject element)
         {
-            if (element != null)
+            if (element != null && _container != null)
             {
                 var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
                 if (decorator != null)
diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
@@ -0,0 +1,9 @@
+﻿using System.Windows.Documents;
+
+namespace HandyControl.Controls
+{
+    public class DialogContainer : AdornerDecorator
+    {
+        
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -27,6 +27,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Block\FloatingBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Button\SplitButton.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\CarouselItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Dialog\DialogContainer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Growl\GrowlWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Image\ImageBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Input\PinBox.cs" />
@@ -147,7 +148,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Carousel\Carousel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\ChatBubble.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Dialog.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Dialog\Dialog.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\GotoTop.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Other\Gravatar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Growl\Growl.cs" />
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
@@ -27,6 +27,7 @@ internal static FrameworkElement GetImplementationRoot(DependencyObject d) =>
 
         public static T GetChild<T>(DependencyObject d) where T : DependencyObject
         {
+            if (d == null) return default;
             if (d is T t) return t;
 
             for (var i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class Dialog : ContentControl`
`14`	`14`	`{`
`15`	`15`	`private string _token;`
`16`	`16`
`17`		`- private Adorner _container;`
	`17`	`+ private AdornerContainer _container;`
`18`	`18`
`19`	`19`	`private static readonly Dictionary<string, FrameworkElement> ContainerDic = new Dictionary<string, FrameworkElement>();`
`20`	`20`
`@@ -107,35 +107,36 @@ public static Dialog Show(object content, string token = "")`
`107`	`107`
`108`	`108`	`FrameworkElement element;`
`109`	`109`
	`110`	`+ AdornerDecorator decorator;`
`110`	`111`	`if (string.IsNullOrEmpty(token))`
`111`	`112`	`{`
`112`	`113`	`element = WindowHelper.GetActiveWindow();`
	`114`	`+ decorator = VisualHelper.GetChild<AdornerDecorator>(element);`
`113`	`115`	`}`
`114`	`116`	`else`
`115`	`117`	`{`
`116`	`118`	`ContainerDic.TryGetValue(token, out element);`
	`119`	`+ decorator = element is System.Windows.Window ?`
	`120`	`+ VisualHelper.GetChild<AdornerDecorator>(element) :`
	`121`	`+ VisualHelper.GetChild<DialogContainer>(element);`
`117`	`122`	`}`
`118`	`123`
`119`		`- if (element != null)`
	`124`	`+ if (decorator != null)`
`120`	`125`	`{`
`121`		`- var decorator = VisualHelper.GetChild<AdornerDecorator>(element);`
`122`		`- if (decorator != null)`
	`126`	`+ if (decorator.Child != null)`
`123`	`127`	`{`
`124`		`- if (decorator.Child != null)`
`125`		`- {`
`126`		`- decorator.Child.IsEnabled = false;`
`127`		`- }`
`128`		`- var layer = decorator.AdornerLayer;`
`129`		`- if (layer != null)`
	`128`	`+ decorator.Child.IsEnabled = false;`
	`129`	`+ }`
	`130`	`+ var layer = decorator.AdornerLayer;`
	`131`	`+ if (layer != null)`
	`132`	`+ {`
	`133`	`+ var container = new AdornerContainer(layer)`
`130`	`134`	`{`
`131`		`- var container = new AdornerContainer(layer)`
`132`		`- {`
`133`		`- Child = dialog`
`134`		`- };`
`135`		`- dialog._container = container;`
`136`		`- dialog.IsClosed = false;`
`137`		`- layer.Add(container);`
`138`		`- }`
	`135`	`+ Child = dialog`
	`136`	`+ };`
	`137`	`+ dialog._container = container;`
	`138`	`+ dialog.IsClosed = false;`
	`139`	`+ layer.Add(container);`
`139`	`140`	`}`
`140`	`141`	`}`
`141`	`142`
`@@ -156,7 +157,7 @@ public void Close()`
`156`	`157`
`157`	`158`	`private void Close(DependencyObject element)`
`158`	`159`	`{`
`159`		`- if (element != null)`
	`160`	`+ if (element != null && _container != null)`
`160`	`161`	`{`
`161`	`162`	`var decorator = VisualHelper.GetChild<AdornerDecorator>(element);`
`162`	`163`	`if (decorator != null)`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ internal static FrameworkElement GetImplementationRoot(DependencyObject d) =>`
`27`	`27`
`28`	`28`	`public static T GetChild<T>(DependencyObject d) where T : DependencyObject`
`29`	`29`	`{`
	`30`	`+ if (d == null) return default;`
`30`	`31`	`if (d is T t) return t;`
`31`	`32`
`32`	`33`	`for (var i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)`