From 61ebba897b2cb65161e62b64116873d7744faa7f Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Tue, 23 Jan 2024 19:55:23 +0800
Subject: [PATCH] feat: extract common button style.

---
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 33 +++++++++++----
 .../Controls/DialogShared.axaml               | 42 +++++++++++++++++++
 .../Controls/MessageBoxWindow.axaml           | 18 +-------
 src/Ursa.Themes.Semi/Controls/_index.axaml    |  1 +
 src/Ursa/Common/DialogButton.cs               | 11 +++++
 src/Ursa/Common/DialogIcon.cs                 | 15 +++++++
 src/Ursa/Common/DialogResult.cs               | 10 +++++
 src/Ursa/Controls/Dialog/DialogControl.cs     | 24 ++++++++++-
 src/Ursa/Controls/Dialog/OverlayDialogHost.cs | 32 ++++----------
 9 files changed, 137 insertions(+), 49 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Controls/DialogShared.axaml
 create mode 100644 src/Ursa/Common/DialogButton.cs
 create mode 100644 src/Ursa/Common/DialogIcon.cs
 create mode 100644 src/Ursa/Common/DialogResult.cs

diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 2b8df2a..160f6b8 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -7,18 +7,29 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:DialogControl">
                 <Border
-                    Classes="Shadow"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
+                    Classes="Hover"
                     IsHitTestVisible="True"
+                    Padding="2"
                     Theme="{DynamicResource CardBorder}">
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <StackPanel Grid.Row="0" HorizontalAlignment="Right">
-                            <Button Name="{x:Static u:DialogControl.PART_CloseButton}" >Close</Button>
-                        </StackPanel>
+                        <DockPanel
+                            Name="{x:Static u:DialogControl.PART_TitleArea}"
+                            Grid.Row="0"
+                            LastChildFill="False"
+                            Background="Transparent">
+                            <TextBlock DockPanel.Dock="Left" Text="Title" Margin="8 8 0 0" />
+                            <Button
+                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                DockPanel.Dock="Right"
+                                Margin="0,4,4,0"
+                                Theme="{DynamicResource CloseButton}">
+                            </Button>
+                        </DockPanel>
                         <ContentPresenter
                             Grid.Row="0"
-                            Grid.RowSpan="2"
+                            Grid.RowSpan="3"
                             Content="{TemplateBinding Content}" />
                     </Grid>
                 </Border>
@@ -58,8 +69,16 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <ChromeOverlayLayer />
                     <Grid RowDefinitions="Auto, *, Auto">
-                        <Button Name="{x:Static u:DialogWindow.PART_CloseButton}" VerticalAlignment="Top" HorizontalAlignment="Right">Close</Button>
-                        <ContentPresenter Grid.Row="0" Grid.RowSpan="2" Content="{TemplateBinding Content}" />
+                        <Button
+                            Name="{x:Static u:DialogWindow.PART_CloseButton}"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top">
+                            Close
+                        </Button>
+                        <ContentPresenter
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Content="{TemplateBinding Content}" />
                     </Grid>
                 </Panel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Controls/DialogShared.axaml b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
new file mode 100644
index 0000000..e4a1fd2
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Controls/DialogShared.axaml
@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    
+    <ControlTheme x:Key="CloseButton" TargetType="Button">
+        <Setter Property="CornerRadius" Value="6" />
+        <Setter Property="Margin" Value="0, 4" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Width" Value="28" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <Border
+                    Name="PART_Border"
+                    Padding="{TemplateBinding Padding}"
+                    Background="Transparent"
+                    CornerRadius="{TemplateBinding CornerRadius}">
+                    <PathIcon
+                        Width="12"
+                        Height="12"
+                        Data="{DynamicResource WindowCloseIconGlyph}"/>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
+        </Style>
+        <Style Selector="^:pointerover /template/ PathIcon">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+
+        <Style Selector="^:pressed /template/ Border">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
+        </Style>
+        <Style Selector="^:pressed /template/ PathIcon">
+            <Setter Property="Foreground" Value="White" />
+        </Style>
+    </ControlTheme>
+    
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
index c0f4913..7e5bd25 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml
@@ -45,23 +45,7 @@
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="1"
                                 Margin="0,4,4,0"
-                                Background="{DynamicResource CaptionButtonClosePointeroverBackground}"
-                                BorderBrush="{DynamicResource CaptionButtonClosePressedBackground}"
-                                Theme="{DynamicResource CaptionButton}">
-                                <Button.Styles>
-                                    <Style Selector="Button:pointerover">
-                                        <Setter Property="Foreground" Value="White" />
-                                    </Style>
-                                    <Style Selector="Button:pressed">
-                                        <Setter Property="Foreground" Value="White" />
-                                    </Style>
-                                </Button.Styles>
-                                <PathIcon
-                                    Width="12"
-                                    Height="12"
-                                    Data="{DynamicResource WindowCloseIconGlyph}"
-                                    Foreground="{Binding $parent[Button].Foreground}" />
-                            </Button>
+                                Theme="{DynamicResource CloseButton}"/>
                         </Grid>
                         <Grid
                             Grid.Row="1"
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index e9ab67e..53bd125 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -5,6 +5,7 @@
         <ResourceInclude Source="Banner.axaml" />
         <ResourceInclude Source="ButtonGroup.axaml" />
         <ResourceInclude Source="Dialog.axaml" />
+        <ResourceInclude Source="DialogShared.axaml" />
         <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="DualBadge.axaml" />
         <ResourceInclude Source="IconButton.axaml" />
diff --git a/src/Ursa/Common/DialogButton.cs b/src/Ursa/Common/DialogButton.cs
new file mode 100644
index 0000000..32e9e4c
--- /dev/null
+++ b/src/Ursa/Common/DialogButton.cs
@@ -0,0 +1,11 @@
+namespace Ursa.Common;
+
+public enum DialogButton
+{
+    None,
+    OK,
+    OKCancel,
+    YesNo,
+    YesNoCancel,
+}
+
diff --git a/src/Ursa/Common/DialogIcon.cs b/src/Ursa/Common/DialogIcon.cs
new file mode 100644
index 0000000..e8a0deb
--- /dev/null
+++ b/src/Ursa/Common/DialogIcon.cs
@@ -0,0 +1,15 @@
+namespace Ursa.Common;
+
+public enum DialogIcon
+{
+    Asterisk, // Same as Information
+    Error,
+    Exclamation, // Same as Warning
+    Hand, // Same as Error
+    Information,
+    None,
+    Question,
+    Stop, // Same as Error
+    Warning,
+    Success,
+}
\ No newline at end of file
diff --git a/src/Ursa/Common/DialogResult.cs b/src/Ursa/Common/DialogResult.cs
new file mode 100644
index 0000000..36b8df4
--- /dev/null
+++ b/src/Ursa/Common/DialogResult.cs
@@ -0,0 +1,10 @@
+namespace Ursa.Common;
+
+public enum DialogResult
+{
+    Cancel,
+    No,
+    None,
+    OK,
+    Yes,
+}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogControl.cs b/src/Ursa/Controls/Dialog/DialogControl.cs
index 10a4ef5..967d0a9 100644
--- a/src/Ursa/Controls/Dialog/DialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DialogControl.cs
@@ -2,16 +2,20 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace Ursa.Controls;
 
 [TemplatePart(PART_CloseButton, typeof(Button))]
+[TemplatePart(PART_TitleArea, typeof(Panel))]
 public class DialogControl: ContentControl
 {
     public const string PART_CloseButton = "PART_CloseButton";
+    public const string PART_TitleArea = "PART_TitleArea";
     
     private Button? _closeButton;
+    private Panel? _titleArea;
     public event EventHandler<object?>? OnClose;
 
     static DialogControl()
@@ -32,6 +36,7 @@ public class DialogControl: ContentControl
         }
         
     }
+    
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
@@ -40,13 +45,30 @@ public class DialogControl: ContentControl
         {
             _closeButton.Click -= Close;
         }
+        _titleArea?.RemoveHandler(PointerMovedEvent, OnTitlePointerMove);
+        _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
+        
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
         if (_closeButton is not null)
         {
             _closeButton.Click += Close;
         }
+        _titleArea?.AddHandler(PointerMovedEvent, OnTitlePointerMove, RoutingStrategies.Bubble);
+        _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
+        
     }
-    
+
+    private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
+    {
+        e.Source = this;
+    }
+
+    private void OnTitlePointerMove(object sender, PointerEventArgs e)
+    {
+        e.Source = this;
+    }
+
 
     public Task<T> ShowAsync<T>()
     {
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
index 0fee47c..fabc8aa 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
+++ b/src/Ursa/Controls/Dialog/OverlayDialogHost.cs
@@ -15,12 +15,6 @@ public class OverlayDialogHost: Canvas
 {
     private readonly List<DialogControl> _dialogs = new();
     private readonly List<DialogControl> _modalDialogs = new();
-
-    private Rectangle _overlayMask = new()
-    {
-        Fill = new SolidColorBrush(new Color(1, 0, 0, 0)),
-        [Rectangle.ZIndexProperty] = 0,
-    };
     
     public static readonly StyledProperty<string> HostIdProperty = AvaloniaProperty.Register<OverlayDialogHost, string>(
         nameof(HostId));
@@ -66,37 +60,27 @@ public class OverlayDialogHost: Canvas
     protected override void OnPointerMoved(PointerEventArgs e)
     {
         base.OnPointerMoved(e);
-        if (e.Source is Control item)
+        if (e.Source is DialogControl item)
         {
             if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
             {
-                var parent  = item.FindAncestorOfType<DialogControl>();
-                if (parent is null)
-                {
-                    return;
-                }
                 var p = e.GetPosition(this);
                 var left=  p.X - _lastPoint.X;
                 var top = p.Y - _lastPoint.Y;
-                left = MathUtilities.Clamp(left, 0, Bounds.Width - parent.Bounds.Width);
-                top = MathUtilities.Clamp(top, 0, Bounds.Height - parent.Bounds.Height);
-                Canvas.SetLeft(parent, left);
-                Canvas.SetTop(parent, top);
+                left = MathUtilities.Clamp(left, 0, Bounds.Width - item.Bounds.Width);
+                top = MathUtilities.Clamp(top, 0, Bounds.Height - item.Bounds.Height);
+                Canvas.SetLeft(item, left);
+                Canvas.SetTop(item, top);
             }
         }
     }
 
     protected override void OnPointerPressed(PointerPressedEventArgs e)
     {
-        base.OnPointerPressed(e);
-        if (e.Source is Control item)
+        // base.OnPointerPressed(e);
+        if (e.Source is DialogControl item)
         {
-            var parent  = item.FindAncestorOfType<DialogControl>();
-            if (parent is null)
-            {
-                return;
-            }
-            _lastPoint = e.GetPosition(parent);
+            _lastPoint = e.GetPosition(item);
         }
     }