From db1889d454031ee8034ea9184bb6e22604892e38 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 7 Sep 2024 01:42:51 +0800
Subject: [PATCH] feat: Add CanDragMove option to dialogs and make sure it can
 be disabled.

---
 demo/Ursa.Demo/Pages/DialogDemo.axaml         |   2 +
 .../ViewModels/DialogDemoViewModel.cs         |   6 +
 src/Ursa/Controls/Dialog/Dialog.cs            | 136 ++++++++----------
 src/Ursa/Controls/Dialog/DialogWindow.cs      |   5 +-
 .../Controls/Dialog/Options/DialogOptions.cs  |   2 +
 5 files changed, 74 insertions(+), 77 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 4a42e99..0331fa4 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -49,6 +49,7 @@
                         u:FormItem.Label="Is Close Button Visible"
                         IsChecked="{Binding IsCloseButtonVisible}"
                         IsThreeState="True" />
+                    <CheckBox u:FormItem.Label="CanDragMove" IsChecked="{Binding CanDragMove}" />
                     <Button
                         HorizontalAlignment="Left"
                         u:FormItem.NoLabel="True"
@@ -83,6 +84,7 @@
                         IsChecked="{Binding IsCloseButtonVisible}"
                         IsThreeState="True" />
                     <CheckBox u:FormItem.Label="Modal" IsChecked="{Binding IsModal}" />
+                    <CheckBox u:FormItem.Label="CanDragMove" IsChecked="{Binding CanDragMove}" />
                     <Button
                         HorizontalAlignment="Left"
                         u:FormItem.NoLabel="True"
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index eab28cc..7b3e95e 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -31,6 +31,7 @@ public partial class DefaultWindowDialogDemoViewModel: ObservableObject
     [ObservableProperty] private DialogButton _button;
     [ObservableProperty] private bool _showInTaskBar;
     [ObservableProperty] private bool? _isCloseButtonVisible;
+    [ObservableProperty] private bool _canDragMove;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -40,6 +41,7 @@ public partial class DefaultWindowDialogDemoViewModel: ObservableObject
         Mode = DialogMode.None;
         Button = DialogButton.OKCancel;
         Location = WindowStartupLocation.CenterScreen;
+        CanDragMove = true;
     }
 
     private async Task ShowDialog()
@@ -52,6 +54,7 @@ public partial class DefaultWindowDialogDemoViewModel: ObservableObject
             ShowInTaskBar = ShowInTaskBar,
             IsCloseButtonVisible = IsCloseButtonVisible,
             StartupLocation = Location,
+            CanDragMove = CanDragMove,
         };
         if (X.HasValue && Y.HasValue)
         {
@@ -70,6 +73,7 @@ public partial class CustomWindowDialogDemoViewModel: ObservableObject
     [ObservableProperty] private bool _showInTaskBar;
     [ObservableProperty] private bool? _isCloseButtonVisible;
     [ObservableProperty] private bool _isModal;
+    [ObservableProperty] private bool _canDragMove;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -78,6 +82,7 @@ public partial class CustomWindowDialogDemoViewModel: ObservableObject
         ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
         Location = WindowStartupLocation.CenterScreen;
         IsModal = true;
+        CanDragMove = true;
     }
 
     private async Task ShowDialog()
@@ -88,6 +93,7 @@ public partial class CustomWindowDialogDemoViewModel: ObservableObject
             ShowInTaskBar = ShowInTaskBar,
             IsCloseButtonVisible = IsCloseButtonVisible,
             StartupLocation = Location,
+            CanDragMove = CanDragMove,
         };
         if (X.HasValue && Y.HasValue)
         {
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index 21dfbe3..08deb07 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -7,7 +7,7 @@ namespace Ursa.Controls;
 public static class Dialog
 {
     /// <summary>
-    /// Show a Window Dialog that with all content fully customized. And the owner of the dialog is specified.
+    ///     Show a Window Dialog that with all content fully customized. And the owner of the dialog is specified.
     /// </summary>
     /// <param name="vm">Dialog ViewModel instance</param>
     /// <param name="owner"></param>
@@ -15,40 +15,14 @@ public static class Dialog
     /// <typeparam name="TView"></typeparam>
     /// <typeparam name="TViewModel"></typeparam>
     /// <returns></returns>
-    public static void ShowCustom<TView, TViewModel>(TViewModel? vm, Window? owner = null, DialogOptions? options = null) 
-        where TView: Control, new()
+    public static void ShowCustom<TView, TViewModel>(TViewModel? vm, Window? owner = null,
+        DialogOptions? options = null)
+        where TView : Control, new()
     {
         var window = new DialogWindow
         {
             Content = new TView(),
-            DataContext = vm,
-        };
-        ConfigureDialogWindow(window, options);
-        owner ??= GetMainWindow();
-        if (owner is null)
-        {
-            window.Show();
-        }
-        else
-        {
-            window.Icon = owner.Icon;
-            window.Show(owner);
-        }
-    }
-    
-    /// <summary>
-    /// Show a Window Dialog that with all content fully customized. And the owner of the dialog is specified. 
-    /// </summary>
-    /// <param name="view">View to show in Dialog Window</param>
-    /// <param name="vm">ViewModel</param>
-    /// <param name="owner">Owner Window</param>
-    /// <param name="options">Dialog options to configure the window. </param>
-    public static void ShowCustom(Control view, object? vm, Window? owner = null, DialogOptions? options = null)
-    { 
-        var window = new DialogWindow
-        {
-            Content = view,
-            DataContext = vm,
+            DataContext = vm
         };
         ConfigureDialogWindow(window, options);
         owner ??= GetMainWindow();
@@ -64,7 +38,34 @@ public static class Dialog
     }
 
     /// <summary>
-    /// Show a Modal Dialog Window with default style.
+    ///     Show a Window Dialog that with all content fully customized. And the owner of the dialog is specified.
+    /// </summary>
+    /// <param name="view">View to show in Dialog Window</param>
+    /// <param name="vm">ViewModel</param>
+    /// <param name="owner">Owner Window</param>
+    /// <param name="options">Dialog options to configure the window. </param>
+    public static void ShowCustom(Control view, object? vm, Window? owner = null, DialogOptions? options = null)
+    {
+        var window = new DialogWindow
+        {
+            Content = view,
+            DataContext = vm
+        };
+        ConfigureDialogWindow(window, options);
+        owner ??= GetMainWindow();
+        if (owner is null)
+        {
+            window.Show();
+        }
+        else
+        {
+            window.Icon = owner.Icon;
+            window.Show(owner);
+        }
+    }
+
+    /// <summary>
+    ///     Show a Modal Dialog Window with default style.
     /// </summary>
     /// <param name="vm"></param>
     /// <param name="owner"></param>
@@ -74,12 +75,12 @@ public static class Dialog
     /// <returns></returns>
     public static Task<DialogResult> ShowModal<TView, TViewModel>(TViewModel vm, Window? owner = null,
         DialogOptions? options = null)
-        where TView: Control, new()
+        where TView : Control, new()
     {
         var window = new DefaultDialogWindow
         {
             Content = new TView(),
-            DataContext = vm,
+            DataContext = vm
         };
         ConfigureDefaultDialogWindow(window, options);
         owner ??= GetMainWindow();
@@ -88,27 +89,26 @@ public static class Dialog
             window.Show();
             return Task.FromResult(DialogResult.None);
         }
-        else
-        {
-            window.Icon = owner.Icon;
-        }
+
+        window.Icon = owner.Icon;
         return window.ShowDialog<DialogResult>(owner);
     }
-    
+
     /// <summary>
-    /// Show a Modal Dialog Window with default style.
+    ///     Show a Modal Dialog Window with default style.
     /// </summary>
     /// <param name="view"></param>
     /// <param name="vm"></param>
     /// <param name="owner"></param>
     /// <param name="options"></param>
     /// <returns></returns>
-    public static Task<DialogResult> ShowModal(Control view, object? vm, Window? owner = null, DialogOptions? options = null)
+    public static Task<DialogResult> ShowModal(Control view, object? vm, Window? owner = null,
+        DialogOptions? options = null)
     {
         var window = new DefaultDialogWindow
         {
             Content = view,
-            DataContext = vm,
+            DataContext = vm
         };
         ConfigureDefaultDialogWindow(window, options);
         owner ??= GetMainWindow();
@@ -117,15 +117,13 @@ public static class Dialog
             window.Show();
             return Task.FromResult(DialogResult.None);
         }
-        else
-        {
-            window.Icon = owner.Icon;
-        }
+
+        window.Icon = owner.Icon;
         return window.ShowDialog<DialogResult>(owner);
     }
 
     /// <summary>
-    /// Show a Modal Dialog Window with all content fully customized. 
+    ///     Show a Modal Dialog Window with all content fully customized.
     /// </summary>
     /// <param name="vm"></param>
     /// <param name="owner"></param>
@@ -136,12 +134,12 @@ public static class Dialog
     /// <returns></returns>
     public static Task<TResult?> ShowCustomModal<TView, TViewModel, TResult>(TViewModel vm, Window? owner = null,
         DialogOptions? options = null)
-        where TView: Control, new()
+        where TView : Control, new()
     {
         var window = new DialogWindow
         {
             Content = new TView(),
-            DataContext = vm,
+            DataContext = vm
         };
         ConfigureDialogWindow(window, options);
         owner ??= GetMainWindow();
@@ -150,15 +148,13 @@ public static class Dialog
             window.Show();
             return Task.FromResult(default(TResult));
         }
-        else
-        {
-            window.Icon = owner.Icon;
-        }
+
+        window.Icon = owner.Icon;
         return window.ShowDialog<TResult?>(owner);
     }
 
     /// <summary>
-    /// Show a Modal Dialog Window with all content fully customized.
+    ///     Show a Modal Dialog Window with all content fully customized.
     /// </summary>
     /// <param name="view"></param>
     /// <param name="vm"></param>
@@ -172,7 +168,7 @@ public static class Dialog
         var window = new DialogWindow
         {
             Content = view,
-            DataContext = vm,
+            DataContext = vm
         };
         ConfigureDialogWindow(window, options);
         owner ??= GetMainWindow();
@@ -181,16 +177,13 @@ public static class Dialog
             window.Show();
             return Task.FromResult(default(TResult));
         }
-        else
-        {
 
-            window.Icon = owner.Icon;
-        }
+        window.Icon = owner.Icon;
         return window.ShowDialog<TResult?>(owner);
     }
-    
+
     /// <summary>
-    /// Get the main window of the application as default owner of the dialog.
+    ///     Get the main window of the application as default owner of the dialog.
     /// </summary>
     /// <returns></returns>
     private static Window? GetMainWindow()
@@ -200,35 +193,29 @@ public static class Dialog
     }
 
     /// <summary>
-    /// Attach options to dialog window.
+    ///     Attach options to dialog window.
     /// </summary>
     /// <param name="window"></param>
     /// <param name="options"></param>
     private static void ConfigureDialogWindow(DialogWindow window, DialogOptions? options)
     {
-        if (options is null)
-        {
-            options = new DialogOptions();
-        }
+        if (options is null) options = new DialogOptions();
         window.WindowStartupLocation = options.StartupLocation;
         window.Title = options.Title;
         window.IsCloseButtonVisible = options.IsCloseButtonVisible;
         window.ShowInTaskbar = options.ShowInTaskBar;
+        window.CanDragMove = options.CanDragMove;
         if (options.StartupLocation == WindowStartupLocation.Manual)
         {
             if (options.Position is not null)
-            {
                 window.Position = options.Position.Value;
-            }
             else
-            {
                 window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-            }
         }
     }
-    
+
     /// <summary>
-    /// Attach options to default dialog window.
+    ///     Attach options to default dialog window.
     /// </summary>
     /// <param name="window"></param>
     /// <param name="options"></param>
@@ -241,16 +228,13 @@ public static class Dialog
         window.Mode = options.Mode;
         window.ShowInTaskbar = options.ShowInTaskBar;
         window.IsCloseButtonVisible = options.IsCloseButtonVisible;
+        window.CanDragMove = options.CanDragMove;
         if (options.StartupLocation == WindowStartupLocation.Manual)
         {
             if (options.Position is not null)
-            {
                 window.Position = options.Position.Value;
-            }
             else
-            {
                 window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index 603496f..29f5398 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -18,6 +18,7 @@ public class DialogWindow : Window
 
     protected internal Button? _closeButton;
     private Panel? _titleArea;
+    public bool CanDragMove { get; set; } = true;
 
     static DialogWindow()
     {
@@ -45,6 +46,7 @@ public class DialogWindow : Window
         IsVisibleProperty.SetValue(IsCloseButtonVisible ?? true, _closeButton);
         Button.ClickEvent.AddHandler(OnCloseButtonClicked, _closeButton);
         _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
+        IsHitTestVisibleProperty.SetValue(CanDragMove, _titleArea);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
     }
 
@@ -63,6 +65,7 @@ public class DialogWindow : Window
 
     private void OnTitlePointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        BeginMoveDrag(e);
+        if (CanDragMove)
+            BeginMoveDrag(e);
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/Options/DialogOptions.cs b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
index 182c7d0..9d3573c 100644
--- a/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
@@ -28,4 +28,6 @@ public class DialogOptions
     public bool? IsCloseButtonVisible { get; set; } = true;
 
     public bool ShowInTaskBar { get; set; } = true;
+    
+    public bool CanDragMove { get; set; } = true;
 }
\ No newline at end of file