From f71e2630bb6e67a271385f4ebeea07e33234da6b Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 24 Dec 2024 18:06:40 +0800
Subject: [PATCH] feat: implement for overlaypopup. change name.

---
 demo/Semi.Avalonia.Demo/App.axaml              |  2 +-
 ...mations.axaml => SemiPopupAnimations.axaml} | 18 +++++++++---------
 ...s.axaml.cs => SemiPopupAnimations.axaml.cs} |  2 +-
 src/Semi.Avalonia/Controls/Popup.axaml         | 14 ++++++++------
 4 files changed, 19 insertions(+), 17 deletions(-)
 rename src/Semi.Avalonia/Animations/{PopupAnimations.axaml => SemiPopupAnimations.axaml} (88%)
 rename src/Semi.Avalonia/Animations/{PopupAnimations.axaml.cs => SemiPopupAnimations.axaml.cs} (59%)

diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml
index f41110b..c3605fa 100644
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -7,7 +7,7 @@
         <!-- You can still reference in old way.  -->
         <!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
         <semi:SemiTheme Locale="zh-cn" />
-        <semi:PopupAnimations/>
+        <semi:SemiPopupAnimations/>
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
     </Application.Styles>
diff --git a/src/Semi.Avalonia/Animations/PopupAnimations.axaml b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
similarity index 88%
rename from src/Semi.Avalonia/Animations/PopupAnimations.axaml
rename to src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
index a08d5cf..ff1486a 100644
--- a/src/Semi.Avalonia/Animations/PopupAnimations.axaml
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
@@ -1,5 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui"
-        x:Class="Semi.Avalonia.PopupAnimations"
+        x:Class="Semi.Avalonia.SemiPopupAnimations"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:converters="clr-namespace:Semi.Avalonia.Converters">
     <Design.PreviewWith>
@@ -18,10 +18,10 @@
     
     <Style Selector="Popup[IsOpen=True] LayoutTransformControl#PART_LayoutTransform">
         <Style.Animations>
-            <Animation Duration="0:0:0.2" FillMode="Forward">
+            <Animation Duration="0:0:0.3" FillMode="Forward" Easing="CubicEaseIn">
                 <KeyFrame Cue="0.0">
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.95"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.95"/>
+                    <Setter Property="ScaleTransform.ScaleX" Value="0.98"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="0.98"/>
                 </KeyFrame>
                 <KeyFrame Cue="1.0">
                     <Setter Property="ScaleTransform.ScaleX" Value="1.0"/>
@@ -32,15 +32,15 @@
     </Style>
     <Style Selector="Popup[IsOpen=False] LayoutTransformControl#PART_LayoutTransform">
         <Style.Animations>
-            <Animation Duration="0:0:0.2" FillMode="Forward">
+            <Animation Duration="0:0:0.3" FillMode="Forward" Easing="CubicEaseOut">
                 <KeyFrame Cue="0.0">
-                    <Setter Property="ScaleTransform.ScaleX" Value="0.95"/>
-                    <Setter Property="ScaleTransform.ScaleY" Value="0.95"/>
-                </KeyFrame>
-                <KeyFrame Cue="1.0">
                     <Setter Property="ScaleTransform.ScaleX" Value="1.0"/>
                     <Setter Property="ScaleTransform.ScaleY" Value="1.0"/>
                 </KeyFrame>
+                <KeyFrame Cue="1.0">
+                    <Setter Property="ScaleTransform.ScaleX" Value="0.98"/>
+                    <Setter Property="ScaleTransform.ScaleY" Value="0.98"/>
+                </KeyFrame>
             </Animation>
         </Style.Animations>
     </Style>
diff --git a/src/Semi.Avalonia/Animations/PopupAnimations.axaml.cs b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
similarity index 59%
rename from src/Semi.Avalonia/Animations/PopupAnimations.axaml.cs
rename to src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
index 4172c6d..00d769e 100644
--- a/src/Semi.Avalonia/Animations/PopupAnimations.axaml.cs
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
@@ -2,7 +2,7 @@ using Avalonia.Styling;
 
 namespace Semi.Avalonia;
 
-public class PopupAnimations: Styles
+public class SemiPopupAnimations: Styles
 {
     
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/Popup.axaml b/src/Semi.Avalonia/Controls/Popup.axaml
index 7a5208b..e8b6037 100644
--- a/src/Semi.Avalonia/Controls/Popup.axaml
+++ b/src/Semi.Avalonia/Controls/Popup.axaml
@@ -31,12 +31,14 @@
             <ControlTemplate>
                 <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
                     <VisualLayerManager IsPopup="True">
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
-                            Padding="{TemplateBinding Padding}"
-                            Background="{TemplateBinding Background}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        <LayoutTransformControl Name="PART_LayoutTransform">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </LayoutTransformControl>
                     </VisualLayerManager>
                 </LayoutTransformControl>
             </ControlTemplate>