From af61b48415959244430ad0475c0e840d4a5e0aca Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Wed, 31 Jan 2024 18:47:08 +0800
Subject: [PATCH] Fix: fix pointer press handling.

---
 demo/Ursa.Demo/Dialogs/DialogWithAction.axaml |   5 +
 demo/Ursa.Demo/Dialogs/PlainDialog.axaml      |   5 +
 src/Ursa.Themes.Semi/Controls/Dialog.axaml    | 185 +++++++++---------
 src/Ursa/Controls/Dialog/DialogWindow.cs      |  11 +-
 4 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
index 3a0d2ac..2f4bef9 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
+++ b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
@@ -15,6 +15,11 @@
             <Button Content="Dialog" Command="{Binding DialogCommand}"></Button>
             <Button Content="OK" Command="{Binding OKCommand}"></Button>
             <Button Content="Cancel" Command="{Binding CancelCommand}"></Button>
+            <ComboBox>
+                <ComboBoxItem>A</ComboBoxItem>
+                <ComboBoxItem>B</ComboBoxItem>
+                <ComboBoxItem>C</ComboBoxItem>
+            </ComboBox>
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
index 89dbb0d..903a8b1 100644
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
@@ -9,5 +9,10 @@
              x:Class="Ursa.Demo.Dialogs.PlainDialog">
     <StackPanel>
         <Calendar SelectedDate="{Binding Date}" ></Calendar>
+        <ComboBox>
+            <ComboBoxItem>A</ComboBoxItem>
+            <ComboBoxItem>B</ComboBoxItem>
+            <ComboBoxItem>C</ComboBoxItem>
+        </ComboBox>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 48259aa..bf11f76 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -387,28 +387,34 @@
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
-                    <ChromeOverlayLayer />
-                    <Grid RowDefinitions="Auto, *">
-                        <ContentPresenter
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
-                            Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
-                            <TextBlock
-                                Grid.Column="0"
-                                Margin="24,24,0,0"
-                                FontSize="14"
-                                FontWeight="Bold"
-                                Text="{TemplateBinding Title}"
-                                TextTrimming="CharacterEllipsis"
-                                TextWrapping="NoWrap" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="1"
-                                Margin="0,24,24,0"
-                                Theme="{DynamicResource CloseButton}" />
+                    <VisualLayerManager>
+                        <Grid RowDefinitions="Auto, *">
+                            <ContentPresenter
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogWindow.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Background="Transparent" />
+                                <TextBlock
+                                    Grid.Column="0"
+                                    Margin="24,24,0,0"
+                                    FontSize="14"
+                                    FontWeight="Bold"
+                                    Text="{TemplateBinding Title}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="1"
+                                    Margin="0,24,24,0"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
                         </Grid>
-                    </Grid>
+                    </VisualLayerManager>
                 </Panel>
             </ControlTemplate>
         </Setter>
@@ -444,75 +450,76 @@
                     <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
                     <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
-                    <ChromeOverlayLayer />
-                    <Grid RowDefinitions="Auto, *, Auto">
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Grid.Row="1"
-                            Margin="24,8"
-                            Content="{TemplateBinding Content}" />
-                        <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
-                            <Panel
-                                Name="{x:Static u:DialogControl.PART_TitleArea}"
-                                Grid.Column="0"
-                                Grid.ColumnSpan="3"
-                                Background="Transparent" />
-                            <PathIcon
-                                Name="PART_Icon"
-                                Grid.Column="0"
-                                Width="16"
-                                Height="16"
-                                Margin="24,24,8,0"
-                                VerticalAlignment="Center" />
-                            <TextBlock
-                                Name="PART_Title"
-                                Grid.Column="1"
-                                Margin="0,24,0,0"
-                                VerticalAlignment="Center"
-                                FontSize="16"
-                                FontWeight="Bold"
-                                IsHitTestVisible="False"
-                                IsVisible="{TemplateBinding Title,
-                                                            Converter={x:Static ObjectConverters.IsNotNull}}"
-                                Text="{TemplateBinding Title}"
-                                TextWrapping="Wrap" />
-                            <Button
-                                Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
-                                Grid.Column="2"
-                                Margin="0,24,24,0"
-                                DockPanel.Dock="Right"
-                                Theme="{DynamicResource CloseButton}" />
+                    <VisualLayerManager>
+                        <Grid RowDefinitions="Auto, *, Auto">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Row="1"
+                                Margin="24,8"
+                                Content="{TemplateBinding Content}" />
+                            <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto">
+                                <Panel
+                                    Name="{x:Static u:DialogWindow.PART_TitleArea}"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    Background="Transparent" />
+                                <PathIcon
+                                    Name="PART_Icon"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="24,24,8,0"
+                                    VerticalAlignment="Center" />
+                                <TextBlock
+                                    Name="PART_Title"
+                                    Grid.Column="1"
+                                    Margin="0,24,0,0"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    FontWeight="Bold"
+                                    IsHitTestVisible="False"
+                                    IsVisible="{TemplateBinding Title,
+                                                                Converter={x:Static ObjectConverters.IsNotNull}}"
+                                    Text="{TemplateBinding Title}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
+                                    Grid.Column="2"
+                                    Margin="0,24,24,0"
+                                    DockPanel.Dock="Right"
+                                    Theme="{DynamicResource CloseButton}" />
+                            </Grid>
+                            <StackPanel
+                                Grid.Row="2"
+                                Margin="24,0,24,24"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Tertiary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Danger"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_NO}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_YES}"
+                                    Theme="{DynamicResource SolidButton}" />
+                                <Button
+                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
+                                    Margin="8,0,0,0"
+                                    Classes="Primary"
+                                    Content="{DynamicResource STRING_MENU_DIALOG_OK}"
+                                    Theme="{DynamicResource SolidButton}" />
+                            </StackPanel>
                         </Grid>
-                        <StackPanel
-                            Grid.Row="2"
-                            Margin="24,0,24,24"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
-                                Margin="8,0,0,0"
-                                Classes="Tertiary"
-                                Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
-                                Margin="8,0,0,0"
-                                Classes="Danger"
-                                Content="{DynamicResource STRING_MENU_DIALOG_NO}"
-                                Theme="{DynamicResource SolidButton}" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Content="{DynamicResource STRING_MENU_DIALOG_YES}"
-                                Theme="{DynamicResource SolidButton}" />
-                            <Button
-                                Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
-                                Margin="8,0,0,0"
-                                Classes="Primary"
-                                Content="{DynamicResource STRING_MENU_DIALOG_OK}"
-                                Theme="{DynamicResource SolidButton}" />
-                        </StackPanel>
-                    </Grid>
+                    </VisualLayerManager>
                 </Panel>
             </ControlTemplate>
         </Setter>
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index f76504c..cabb0f4 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -9,13 +9,15 @@ using Ursa.Common;
 namespace Ursa.Controls;
 
 [TemplatePart(PART_CloseButton, typeof(Button))]
+[TemplatePart(PART_TitleArea, typeof(Panel))]
 public class DialogWindow: Window
 {
     public const string PART_CloseButton = "PART_CloseButton";
-    
+    public const string PART_TitleArea = "PART_TitleArea";
     protected override Type StyleKeyOverride { get; } = typeof(DialogWindow);
 
     private Button? _closeButton;
+    private Panel? _titleArea;
 
     static DialogWindow()
     {
@@ -39,7 +41,10 @@ public class DialogWindow: Window
     {
         base.OnApplyTemplate(e);
         EventHelper.UnregisterClickEvent(OnDefaultClose, _closeButton);
+        _titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
         _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        _titleArea = e.NameScope.Find<Panel>(PART_TitleArea);
+        _titleArea?.AddHandler(PointerPressedEvent, OnTitlePointerPressed, RoutingStrategies.Bubble);
         EventHelper.RegisterClickEvent(OnDefaultClose, _closeButton);
     }
 
@@ -59,8 +64,8 @@ public class DialogWindow: Window
             Close(null);
         }
     }
-
-    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    
+    private void OnTitlePointerPressed(object sender, PointerPressedEventArgs e)
     {
         this.BeginMoveDrag(e);
     }