From 2ac5dfa1702b78cf521e687612ace9b1da30e8f4 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Mon, 5 Feb 2024 01:18:08 +0800
Subject: [PATCH] feat: WIP.

---
 .../{Dialog => OverlayShared}/OverlayDialogHost.Dialog.cs  | 0
 .../{Dialog => OverlayShared}/OverlayDialogHost.Drawer.cs  | 1 -
 .../{Dialog => OverlayShared}/OverlayDialogHost.Shared.cs  | 7 ++++---
 .../{Dialog => OverlayShared}/OverlayDialogManager.cs      | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/Ursa/Controls/{Dialog => OverlayShared}/OverlayDialogHost.Dialog.cs (100%)
 rename src/Ursa/Controls/{Dialog => OverlayShared}/OverlayDialogHost.Drawer.cs (97%)
 rename src/Ursa/Controls/{Dialog => OverlayShared}/OverlayDialogHost.Shared.cs (95%)
 rename src/Ursa/Controls/{Dialog => OverlayShared}/OverlayDialogManager.cs (100%)

diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.Dialog.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
similarity index 100%
rename from src/Ursa/Controls/Dialog/OverlayDialogHost.Dialog.cs
rename to src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.Drawer.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
similarity index 97%
rename from src/Ursa/Controls/Dialog/OverlayDialogHost.Drawer.cs
rename to src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
index 554876c..7b8bf36 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.Drawer.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
@@ -28,7 +28,6 @@ public partial class OverlayDialogHost
         control.Arrange(new Rect(control.DesiredSize));
         control.Height = this.Bounds.Height;
         control.AddHandler(OverlayFeedbackElement.ClosedEvent, OnDrawerControlClosing);
-        // SetLeft(control, this.Bounds.Width - control.Bounds.Width);
         var animation = CreateAnimation(control.Bounds.Width);
         var animation2 = CreateOpacityAnimation();
         await Task.WhenAll(animation.RunAsync(control), animation2.RunAsync(mask));
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogHost.Shared.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
similarity index 95%
rename from src/Ursa/Controls/Dialog/OverlayDialogHost.Shared.cs
rename to src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
index a92cbf5..5563139 100644
--- a/src/Ursa/Controls/Dialog/OverlayDialogHost.Shared.cs
+++ b/src/Ursa/Controls/OverlayShared/OverlayDialogHost.Shared.cs
@@ -20,6 +20,7 @@ public partial class OverlayDialogHost: Canvas
     
     static OverlayDialogHost()
     {
+        ClipToBoundsProperty.OverrideDefaultValue<OverlayDialogHost>(true);
         _maskAppearAnimation = CreateOpacityAnimation(true);
         _maskDisappearAnimation = CreateOpacityAnimation(false);
     }
@@ -34,7 +35,7 @@ public partial class OverlayDialogHost: Canvas
         keyFrame2.Setters.Add(new Setter() { Property = OpacityProperty, Value = appear ? 1.0 : 0.0 });
         animation.Children.Add(keyFrame1);
         animation.Children.Add(keyFrame2);
-        animation.Duration = TimeSpan.FromSeconds(0.3);
+        animation.Duration = TimeSpan.FromSeconds(0.2);
         return animation;
     }
     
@@ -75,9 +76,9 @@ public partial class OverlayDialogHost: Canvas
         if (sender is Border border)
         {
             int i = _masks.IndexOf(border);
-            if (_modalDialogs[i] is { } dialog)
+            if (_modalDialogs[i] is { } element)
             {
-                dialog.Close();
+                element.Close();
                 border.RemoveHandler(PointerReleasedEvent, ClickBorderToCloseDialog);
             }
         }
diff --git a/src/Ursa/Controls/Dialog/OverlayDialogManager.cs b/src/Ursa/Controls/OverlayShared/OverlayDialogManager.cs
similarity index 100%
rename from src/Ursa/Controls/Dialog/OverlayDialogManager.cs
rename to src/Ursa/Controls/OverlayShared/OverlayDialogManager.cs