From 39457f97247d5a4a4333ded5ac2bbc2465f7510e Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sat, 3 Feb 2024 20:07:39 +0800
Subject: [PATCH] feat: re-organize file, add IsCloseButtonVisible option.

---
 .../Controls/Dialog/DefaultDialogControl.cs   | 23 +++++++++
 .../Controls/Dialog/DefaultDialogWindow.cs    | 23 +++++++++
 src/Ursa/Controls/Dialog/DialogControl.cs     | 48 +++++++++----------
 src/Ursa/Controls/Dialog/DialogWindow.cs      | 14 ++++--
 .../Dialog/Options}/DialogButton.cs           |  2 +-
 .../Dialog/{ => Options}/DialogMode.cs        |  0
 .../Dialog/{ => Options}/DialogOptions.cs     |  4 +-
 .../Dialog/Options}/DialogResult.cs           |  2 +-
 .../{ => Options}/OverlayDialogOptions.cs     |  5 +-
 9 files changed, 87 insertions(+), 34 deletions(-)
 rename src/Ursa/{Common => Controls/Dialog/Options}/DialogButton.cs (76%)
 rename src/Ursa/Controls/Dialog/{ => Options}/DialogMode.cs (100%)
 rename src/Ursa/Controls/Dialog/{ => Options}/DialogOptions.cs (87%)
 rename src/Ursa/{Common => Controls/Dialog/Options}/DialogResult.cs (73%)
 rename src/Ursa/Controls/Dialog/{ => Options}/OverlayDialogOptions.cs (88%)

diff --git a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
index 527e278..385dba1 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
@@ -68,6 +68,8 @@ public class DefaultDialogControl: DialogControl
     
     private void SetButtonVisibility()
     {
+        bool isCloseButtonVisible = DataContext is IDialogContext || Buttons != DialogButton.YesNo;
+        SetVisibility(_closeButton, isCloseButtonVisible);
         switch (Buttons)
         {
             case DialogButton.None:
@@ -130,4 +132,25 @@ public class DefaultDialogControl: DialogControl
             }
         }
     }
+
+    internal override void CloseDialog()
+    {
+        if (DataContext is IDialogContext context)
+        {
+            context.Close();
+        }
+        else
+        {
+            DialogResult result = Buttons switch
+            {
+                DialogButton.None => DialogResult.None,
+                DialogButton.OK => DialogResult.OK,
+                DialogButton.OKCancel => DialogResult.Cancel,
+                DialogButton.YesNo => DialogResult.No,
+                DialogButton.YesNoCancel => DialogResult.Cancel,
+                _ => DialogResult.None
+            };
+            OnDialogControlClosing(this, result);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
index 3a51c2d..123affc 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
@@ -83,6 +83,8 @@ public class DefaultDialogWindow: DialogWindow
 
     private void SetButtonVisibility()
     {
+        bool closeButtonVisible = DataContext is IDialogContext || Buttons != DialogButton.YesNo;
+        SetVisibility(_closeButton, closeButtonVisible);
         switch (Buttons)
         {
             case DialogButton.None:
@@ -122,4 +124,25 @@ public class DefaultDialogWindow: DialogWindow
     {
         if (button is not null) button.IsVisible = visible;
     }
+
+    protected internal override void OnCloseButtonClicked(object sender, RoutedEventArgs args)
+    {
+        if (DataContext is IDialogContext context)
+        {
+            context.Close();
+        }
+        else
+        {
+            DialogResult result = Buttons switch
+            {
+                DialogButton.None => DialogResult.None,
+                DialogButton.OK => DialogResult.OK,
+                DialogButton.OKCancel => DialogResult.Cancel,
+                DialogButton.YesNo => DialogResult.No,
+                DialogButton.YesNoCancel => DialogResult.Cancel,
+                _ => DialogResult.None
+            };
+            Close(result);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index cb04b5b..386d58f 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -31,6 +31,7 @@ public class DialogControl: ContentControl
     internal double? HorizontalOffsetRatio { get; set; }
     internal double? VerticalOffsetRatio { get; set; }
     internal bool CanClickOnMaskToClose { get; set; }
+    internal bool IsCloseButtonVisible { get; set; }
     
     public event EventHandler<DialogLayerChangeEventArgs>? LayerChanged;
     public event EventHandler<object?>? DialogControlClosing;
@@ -57,7 +58,7 @@ public class DialogControl: ContentControl
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(Close, _closeButton);
+        EventHelper.UnregisterClickEvent(OnCloseButtonClick, _closeButton);
 
         _titleArea?.RemoveHandler(PointerMovedEvent, OnTitlePointerMove);
         _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
@@ -65,12 +66,14 @@ public class DialogControl: ContentControl
         
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
         _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
-
-        
+        if (_closeButton is not null)
+        {
+            _closeButton.IsVisible = IsCloseButtonVisible;
+        }
         _titleArea?.AddHandler(PointerMovedEvent, OnTitlePointerMove, RoutingStrategies.Bubble);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
         _titleArea?.AddHandler(PointerReleasedEvent, OnTitlePointerRelease, RoutingStrategies.Bubble);
-        EventHelper.RegisterClickEvent(Close, _closeButton);
+        EventHelper.RegisterClickEvent(OnCloseButtonClick, _closeButton);
     }
     
     private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
@@ -113,25 +116,12 @@ public class DialogControl: ContentControl
         this.DialogControlClosing += OnCloseHandler;
         return tcs.Task;
     }
-    
-    private void Close(object sender, RoutedEventArgs args)
-    {
-        if (this.DataContext is IDialogContext context)
-        {
-            context.Close();
-        }
-        else
-        {
-            DialogControlClosing?.Invoke(this, DialogResult.None);
-        }
-    }
+
+    private void OnCloseButtonClick(object sender, RoutedEventArgs args) => CloseDialog();
 
     private void OnContextRequestClose(object sender, object? args)
     {
-        if (this.DataContext is IDialogContext context)
-        {
-            DialogControlClosing?.Invoke(this, args);
-        }
+        DialogControlClosing?.Invoke(this, args);
     }
     
 
@@ -143,7 +133,12 @@ public class DialogControl: ContentControl
         }
     }
     
-    protected virtual void OnDialogControlClosing(object sender, object? args)
+    /// <summary>
+    /// Used for inherited classes to invoke the DialogControlClosing event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="args"></param>
+    protected internal virtual void OnDialogControlClosing(object sender, object? args)
     {
         DialogControlClosing?.Invoke(this, args);
     }
@@ -153,15 +148,20 @@ public class DialogControl: ContentControl
         PseudoClasses.Set(PC_Modal, modal);
     }
 
-    internal void CloseDialog()
+    /// <summary>
+    /// This method is exposed internally for closing the dialog from neither context nor closing by clicking on the close button.
+    /// It is also exposed to be bound to context flyout.
+    /// It is virtual because inherited classes may return a different result by default. 
+    /// </summary>
+    internal virtual void CloseDialog()
     {
-        if (this.DataContext is IDialogContext context)
+        if (DataContext is IDialogContext context)
         {
             context.Close();
         }
         else
         {
-            DialogControlClosing?.Invoke(this, DialogResult.None);
+            DialogControlClosing?.Invoke(this, null);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index cabb0f4..d8ffc9d 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -16,8 +16,10 @@ public class DialogWindow: Window
     public const string PART_TitleArea = "PART_TitleArea";
     protected override Type StyleKeyOverride { get; } = typeof(DialogWindow);
 
-    private Button? _closeButton;
+    protected internal Button? _closeButton;
     private Panel? _titleArea;
+    
+    internal bool IsCloseButtonVisible { get; set; }
 
     static DialogWindow()
     {
@@ -40,12 +42,16 @@ public class DialogWindow: Window
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        EventHelper.UnregisterClickEvent(OnDefaultClose, _closeButton);
+        EventHelper.UnregisterClickEvent(OnCloseButtonClicked, _closeButton);
         _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        if (_closeButton is not null)
+        {
+            _closeButton.IsVisible = IsCloseButtonVisible;
+        }
         _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
         _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
-        EventHelper.RegisterClickEvent(OnDefaultClose, _closeButton);
+        EventHelper.RegisterClickEvent(OnCloseButtonClicked, _closeButton);
     }
 
     private void OnContextRequestClose(object? sender, object? args)
@@ -53,7 +59,7 @@ public class DialogWindow: Window
         Close(args);
     }
 
-    private void OnDefaultClose(object sender, RoutedEventArgs args)
+    protected internal virtual void OnCloseButtonClicked(object sender, RoutedEventArgs args)
     {
         if (DataContext is IDialogContext context)
         {
diff --git a/src/Ursa/Common/DialogButton.cs b/src/Ursa/Controls/Dialog/Options/DialogButton.cs
similarity index 76%
rename from src/Ursa/Common/DialogButton.cs
rename to src/Ursa/Controls/Dialog/Options/DialogButton.cs
index 32e9e4c..45ff7d5 100644
--- a/src/Ursa/Common/DialogButton.cs
+++ b/src/Ursa/Controls/Dialog/Options/DialogButton.cs
@@ -1,4 +1,4 @@
-namespace Ursa.Common;
+namespace Ursa.Controls;
 
 public enum DialogButton
 {
diff --git a/src/Ursa/Controls/Dialog/DialogMode.cs b/src/Ursa/Controls/Dialog/Options/DialogMode.cs
similarity index 100%
rename from src/Ursa/Controls/Dialog/DialogMode.cs
rename to src/Ursa/Controls/Dialog/Options/DialogMode.cs
diff --git a/src/Ursa/Controls/Dialog/DialogOptions.cs b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
similarity index 87%
rename from src/Ursa/Controls/Dialog/DialogOptions.cs
rename to src/Ursa/Controls/Dialog/Options/DialogOptions.cs
index 7196597..6c65ff5 100644
--- a/src/Ursa/Controls/Dialog/DialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs
@@ -1,11 +1,11 @@
 using Avalonia;
 using Avalonia.Controls;
-using Ursa.Common;
 
 namespace Ursa.Controls;
 
 public class DialogOptions
 {
+    public static DialogOptions Default { get; } = new DialogOptions();
     /// <summary>
     /// The Startup Location of DialogWindow. Default is <see cref="WindowStartupLocation.CenterOwner"/>
     /// </summary>
@@ -24,4 +24,6 @@ public class DialogOptions
     public DialogMode Mode { get; set; } = DialogMode.None;
 
     public DialogButton Button { get; set; } = DialogButton.OKCancel;
+
+    public bool IsCloseButtonVisible { get; set; } = true;
 }
\ No newline at end of file
diff --git a/src/Ursa/Common/DialogResult.cs b/src/Ursa/Controls/Dialog/Options/DialogResult.cs
similarity index 73%
rename from src/Ursa/Common/DialogResult.cs
rename to src/Ursa/Controls/Dialog/Options/DialogResult.cs
index 36b8df4..e5755f1 100644
--- a/src/Ursa/Common/DialogResult.cs
+++ b/src/Ursa/Controls/Dialog/Options/DialogResult.cs
@@ -1,4 +1,4 @@
-namespace Ursa.Common;
+namespace Ursa.Controls;
 
 public enum DialogResult
 {
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs b/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
similarity index 88%
rename from src/Ursa/Controls/Dialog/OverlayDialogOptions.cs
rename to src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
index eb94c71..f5e6139 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogOptions.cs
+++ b/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
@@ -1,6 +1,4 @@
-using Ursa.Common;
-
-namespace Ursa.Controls;
+namespace Ursa.Controls;
 
 public enum HorizontalPosition
 {
@@ -26,4 +24,5 @@ public class OverlayDialogOptions
     public DialogMode Mode { get; set; } = DialogMode.None;
     public DialogButton Buttons { get; set; } = DialogButton.OKCancel;
     public string? Title { get; set; } = null;
+    public bool IsCloseButtonVisible { get; set; } = true;
 }
\ No newline at end of file