From 4dc0fd9e0c658c1b208136191caf38f3288af79e Mon Sep 17 00:00:00 2001
From: idea-zone <idea_zone@126.com>
Date: Thu, 1 Feb 2024 08:53:50 +0800
Subject: [PATCH] =?UTF-8?q?DialogControl=20=E5=A2=9E=E5=8A=A0=20ShowCustom?=
 =?UTF-8?q?=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |  2 +-
 .../ViewModels/DialogDemoViewModel.cs         | 15 +++++--
 src/Ursa/Controls/Dialog/Dialog.cs            | 41 +++++++++++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 75b27c1..a760153 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -56,7 +56,7 @@
                 <StackPanel>
                     <ToggleSwitch Content="Window/Overlay" OffContent="Overlay" OnContent="Window" IsChecked="{Binding IsWindow}" Name="overlay2" />
                     <ToggleSwitch Content="Global/Local" IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Local" OnContent="Global" IsChecked="{Binding IsGlobal}" />
-                    <ToggleSwitch Content="Modal/Regular" IsVisible="{Binding !#overlay2.IsChecked}" OffContent="Regular" OnContent="Modal" IsChecked="{Binding IsModal}" />
+                    <ToggleSwitch Content="Modal/Regular" OffContent="Regular" OnContent="Modal" IsChecked="{Binding IsModal}" />
                     <Button Content="Show Dialog" Command="{Binding ShowCustomDialogCommand}" />
                     <TextBlock>
                         <Run Text="Custom Result: "></Run>
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 163e7b7..cc8c5e5 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -128,10 +128,19 @@ public class DialogDemoViewModel: ObservableObject
         var vm = new DialogWithActionViewModel();
         if (IsWindow)
         {
+
+            if (IsModal)
+            {
+                Result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
+                    vm);
+                Date = vm.Date;
+            }
+            else
+            {
+                Dialog.ShowCustom<DialogWithAction, DialogWithActionViewModel>(
+                    vm);
+            }
             
-            Result = await Dialog.ShowCustomModalAsync<DialogWithAction, DialogWithActionViewModel, bool>(
-                vm);
-            Date = vm.Date;
         }
         else
         {
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index 39ad610..bdccbcd 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -24,6 +24,19 @@ public static class Dialog
         return await ShowCustomModalAsync<TView, TViewModel, TResult>(mainWindow, vm);
     }
     
+    /// <summary>
+    /// Show a Window Dialog that with all content fully customized. 
+    /// </summary>
+    /// <param name="vm"></param>
+    /// <typeparam name="TView"></typeparam>
+    /// <typeparam name="TViewModel"></typeparam>
+    /// <returns></returns>
+    public static void ShowCustom<TView, TViewModel>(TViewModel vm) 
+        where TView : Control, new()
+    {
+        var mainWindow = GetMainWindow();
+        ShowCustom<TView, TViewModel>(mainWindow, vm);
+    }
     
     /// <summary>
     /// Show a Window Modal Dialog that with all content fully customized. And the owner of the dialog is specified.
@@ -54,6 +67,33 @@ public static class Dialog
         }
     }
     
+    
+    /// <summary>
+    /// Show a Window Dialog that with all content fully customized. And the owner of the dialog is specified.
+    /// </summary>
+    /// <param name="owner"></param>
+    /// <param name="vm"></param>
+    /// <typeparam name="TView"></typeparam>
+    /// <typeparam name="TViewModel"></typeparam>
+    /// <returns></returns>
+    public static void ShowCustom<TView, TViewModel>(Window? owner, TViewModel? vm) 
+        where TView: Control, new()
+    {
+        var window = new DialogWindow
+        {
+            Content = new TView { DataContext = vm },
+            DataContext = vm,
+        };
+        if (owner is null)
+        {
+            window.Show();
+        }
+        else
+        {
+            window.Show(owner);
+        }
+    }
+    
     public static async Task<DialogResult> ShowModalAsync<TView, TViewModel>(
         Window? owner, 
         TViewModel vm, 
@@ -170,4 +210,5 @@ public static class OverlayDialog
         host?.AddDialog(t);
     }
     
+    
 }
\ No newline at end of file