From 116786fbe542dc404dabfa5077c8f599eeacb032 Mon Sep 17 00:00:00 2001
From: chinboy <chinboy@qinware.com>
Date: Sat, 1 Mar 2025 22:06:25 +0800
Subject: [PATCH] Refactor motion property

---
 .../AddOnDecoratedInnerBox.cs                 |  4 +--
 .../ArrowDecoratedBox/ArrowDecoratedBox.cs    |  4 +--
 src/AtomUI.Controls/Badge/CountBadge.cs       |  4 +--
 src/AtomUI.Controls/Badge/DotBadge.cs         |  4 +--
 .../ButtonSpinner/ButtonSpinner.cs            |  4 +--
 src/AtomUI.Controls/Buttons/Button.cs         | 27 ++++++++++------
 src/AtomUI.Controls/Buttons/IconButton.cs     |  6 ++--
 .../Calendar/BaseCalendarDayButton.cs         | 26 +++++++++-------
 src/AtomUI.Controls/Calendar/Calendar.cs      |  4 +--
 .../Calendar/HeadTextButton.cs                | 16 ++++++----
 src/AtomUI.Controls/CheckBox/CheckBox.cs      |  4 +--
 src/AtomUI.Controls/Collapse/Collapse.cs      |  4 +--
 src/AtomUI.Controls/ComboBox/ComboBox.cs      |  4 +--
 src/AtomUI.Controls/Drawer/Drawer.cs          |  4 +--
 src/AtomUI.Controls/Expander/Expander.cs      |  4 +--
 src/AtomUI.Controls/Flyouts/FlyoutHost.cs     |  4 +--
 .../Flyouts/MenuFlyoutPresenter.cs            |  4 +--
 .../Flyouts/PopupFlyoutBase.cs                | 31 +++++++++++--------
 src/AtomUI.Controls/Input/LineEdit.cs         | 10 +++---
 .../InfoPickerInput/InfoPickerInput.cs        |  4 +--
 src/AtomUI.Controls/ListBox/ListBox.cs        |  4 +--
 src/AtomUI.Controls/Menu/ContextMenu.cs       |  4 +--
 src/AtomUI.Controls/Menu/Menu.cs              |  4 +--
 src/AtomUI.Controls/Message/MessageCard.cs    |  4 +--
 .../Message/WindowMessageManager.cs           |  4 +--
 src/AtomUI.Controls/NavMenu/NavMenuBase.cs    |  4 +--
 .../Notifications/NotificationCard.cs         |  4 +--
 .../WindowNotificationManager.cs              |  4 +--
 .../NumericUpDown/NumericUpDown.cs            |  6 ++--
 .../OptionButtonBox/OptionButtonGroup.cs      |  4 +--
 src/AtomUI.Controls/Popup/Popup.cs            |  4 +--
 .../ProgressBar/AbstractProgressBar.cs        |  4 +--
 .../RadioButton/RadioButton.cs                |  4 +--
 src/AtomUI.Controls/Segmented/Segmented.cs    |  4 +--
 src/AtomUI.Controls/Slider/Slider.cs          | 21 +++++++------
 src/AtomUI.Controls/Switch/ToggleSwitch.cs    |  8 ++---
 .../TabControl/BaseTabControl.cs              |  4 +--
 .../TabControl/TabStrip/BaseTabStrip.cs       |  4 +--
 src/AtomUI.Controls/Tooltip/ToolTip.cs        |  4 +--
 src/AtomUI.Controls/TreeView/TreeView.cs      |  6 ++--
 src/AtomUI.IconPkg/Icon.cs                    |  4 +--
 src/AtomUI.Theme/IAnimationAwareControl.cs    |  2 +-
 42 files changed, 152 insertions(+), 131 deletions(-)

diff --git a/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedInnerBox.cs b/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedInnerBox.cs
index 934e5be73..39674ed7e 100644
--- a/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedInnerBox.cs
+++ b/src/AtomUI.Controls/AddOnDecoratedBox/AddOnDecoratedInnerBox.cs
@@ -40,10 +40,10 @@ public class AddOnDecoratedInnerBox : ContentControl,
         AvaloniaProperty.Register<AddOnDecoratedInnerBox, bool>(nameof(IsClearButtonVisible));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<AddOnDecoratedInnerBox, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<AddOnDecoratedInnerBox>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<AddOnDecoratedInnerBox, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<AddOnDecoratedInnerBox>();
 
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs b/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs
index efc182aba..2f29ff500 100644
--- a/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs
+++ b/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs
@@ -97,10 +97,10 @@ public class ArrowDecoratedBox : ContentControl,
             nameof(ArrowPosition));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<ArrowDecoratedBox, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ArrowDecoratedBox>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<ArrowDecoratedBox, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ArrowDecoratedBox>();
 
     /// <summary>
     /// 是否显示指示箭头
diff --git a/src/AtomUI.Controls/Badge/CountBadge.cs b/src/AtomUI.Controls/Badge/CountBadge.cs
index 3b4784b96..f16247cbd 100644
--- a/src/AtomUI.Controls/Badge/CountBadge.cs
+++ b/src/AtomUI.Controls/Badge/CountBadge.cs
@@ -56,10 +56,10 @@ public class CountBadge : Control,
         AvaloniaProperty.Register<CountBadge, bool>(nameof(BadgeIsVisible), true);
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<CountBadge, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<CountBadge>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<CountBadge, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<CountBadge>();
 
     public string? BadgeColor
     {
diff --git a/src/AtomUI.Controls/Badge/DotBadge.cs b/src/AtomUI.Controls/Badge/DotBadge.cs
index 13a37130a..5cb14863f 100644
--- a/src/AtomUI.Controls/Badge/DotBadge.cs
+++ b/src/AtomUI.Controls/Badge/DotBadge.cs
@@ -49,10 +49,10 @@ public class DotBadge : Control,
         AvaloniaProperty.Register<DotBadge, bool>(nameof(BadgeIsVisible));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<DotBadge, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<DotBadge>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<DotBadge, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<DotBadge>();
 
     public string? DotColor
     {
diff --git a/src/AtomUI.Controls/ButtonSpinner/ButtonSpinner.cs b/src/AtomUI.Controls/ButtonSpinner/ButtonSpinner.cs
index f00289223..b0f1a5561 100644
--- a/src/AtomUI.Controls/ButtonSpinner/ButtonSpinner.cs
+++ b/src/AtomUI.Controls/ButtonSpinner/ButtonSpinner.cs
@@ -39,10 +39,10 @@ public class ButtonSpinner : AvaloniaButtonSpinner,
         AddOnDecoratedBox.StatusProperty.AddOwner<ButtonSpinner>();
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<ButtonSpinner, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ButtonSpinner>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<ButtonSpinner, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ButtonSpinner>();
 
     public object? LeftAddOn
     {
diff --git a/src/AtomUI.Controls/Buttons/Button.cs b/src/AtomUI.Controls/Buttons/Button.cs
index 909418ac2..78bfe855a 100644
--- a/src/AtomUI.Controls/Buttons/Button.cs
+++ b/src/AtomUI.Controls/Buttons/Button.cs
@@ -79,10 +79,10 @@ public class Button : AvaloniaButton,
         = AvaloniaProperty.Register<Button, bool>(nameof(IsIconVisible), true);
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Button, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Button>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Button, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Button>();
 
     public ButtonType ButtonType
     {
@@ -354,7 +354,7 @@ public class Button : AvaloniaButton,
         }
 
         SetupControlThemeBindings();
-        
+
         this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(this, BorderThicknessProperty,
             SharedTokenKey.BorderThickness,
             BindingPriority.Template,
@@ -486,7 +486,8 @@ public class Button : AvaloniaButton,
     {
         if (Shape == ButtonShape.Circle)
         {
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(this, PaddingProperty, ButtonTokenKey.CirclePadding));
+            this.AddTokenBindingDisposable(
+                TokenResourceBinder.CreateTokenBinding(this, PaddingProperty, ButtonTokenKey.CirclePadding));
         }
     }
 
@@ -680,23 +681,29 @@ public class Button : AvaloniaButton,
         {
             this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(Icon, Icon.NormalFilledBrushProperty,
                 normalFilledBrushKey));
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(Icon, Icon.SelectedFilledBrushProperty,
+            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(Icon,
+                Icon.SelectedFilledBrushProperty,
                 selectedFilledBrushKey));
             this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(Icon, Icon.ActiveFilledBrushProperty,
                 activeFilledBrushKey));
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(Icon, Icon.DisabledFilledBrushProperty,
+            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(Icon,
+                Icon.DisabledFilledBrushProperty,
                 disabledFilledBrushKey));
         }
 
         if (_loadingIcon is not null)
         {
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon, Icon.NormalFilledBrushProperty,
+            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon,
+                Icon.NormalFilledBrushProperty,
                 normalFilledBrushKey));
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon, Icon.SelectedFilledBrushProperty,
+            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon,
+                Icon.SelectedFilledBrushProperty,
                 selectedFilledBrushKey));
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon, Icon.ActiveFilledBrushProperty,
+            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon,
+                Icon.ActiveFilledBrushProperty,
                 activeFilledBrushKey));
-            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon, Icon.DisabledFilledBrushProperty,
+            this.AddTokenBindingDisposable(TokenResourceBinder.CreateTokenBinding(_loadingIcon,
+                Icon.DisabledFilledBrushProperty,
                 disabledFilledBrushKey));
         }
 
diff --git a/src/AtomUI.Controls/Buttons/IconButton.cs b/src/AtomUI.Controls/Buttons/IconButton.cs
index 2e1fa2236..1c97d2be0 100644
--- a/src/AtomUI.Controls/Buttons/IconButton.cs
+++ b/src/AtomUI.Controls/Buttons/IconButton.cs
@@ -36,12 +36,12 @@ public class IconButton : AvaloniaButton,
 
     public static readonly StyledProperty<bool> IsEnableHoverEffectProperty
         = AvaloniaProperty.Register<IconButton, bool>(nameof(IsEnableHoverEffect));
-    
+
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<IconButton, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<IconButton>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<IconButton, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<IconButton>();
 
     public Icon? Icon
     {
diff --git a/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs b/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs
index 6c5ee296a..47363810f 100644
--- a/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs
+++ b/src/AtomUI.Controls/Calendar/BaseCalendarDayButton.cs
@@ -30,16 +30,20 @@ internal class BaseCalendarDayButton : AvaloniaButton,
     internal const string TodayPC = ":today";
     internal const string BlackoutPC = ":blackout";
     internal const string DayfocusedPC = ":dayfocused";
-    
-    internal static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<BaseCalendarDayButton, bool>(nameof(IsMotionEnabled), true);
-    
-    public bool IsMotionEnabled
+
+    internal static readonly DirectProperty<BaseCalendarDayButton, bool> IsMotionEnabledProperty
+        = AvaloniaProperty.RegisterDirect<BaseCalendarDayButton, bool>(nameof(IsMotionEnabled),
+            o => o.IsMotionEnabled,
+            (o, v) => o.IsMotionEnabled = v);
+
+    private bool _isMotionEnabled;
+
+    internal bool IsMotionEnabled
     {
-        get => GetValue(IsMotionEnabledProperty);
-        set => SetValue(IsMotionEnabledProperty, value);
+        get => _isMotionEnabled;
+        set => SetAndRaise(IsMotionEnabledProperty, ref _isMotionEnabled, value);
     }
-    
+
     CompositeDisposable? ITokenResourceConsumer.TokenBindingsDisposable => _tokenBindingsDisposable;
     private CompositeDisposable? _tokenBindingsDisposable;
 
@@ -189,7 +193,7 @@ internal class BaseCalendarDayButton : AvaloniaButton,
         SetPseudoClasses();
         SetupTransitions();
     }
-    
+
     private void SetupTransitions()
     {
         if (IsMotionEnabled)
@@ -289,7 +293,7 @@ internal class BaseCalendarDayButton : AvaloniaButton,
             CalendarDayButtonMouseUp?.Invoke(this, e);
         }
     }
-    
+
     protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
     {
         base.OnAttachedToLogicalTree(e);
@@ -304,7 +308,7 @@ internal class BaseCalendarDayButton : AvaloniaButton,
         base.OnDetachedFromLogicalTree(e);
         this.DisposeTokenBindings();
     }
-    
+
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
diff --git a/src/AtomUI.Controls/Calendar/Calendar.cs b/src/AtomUI.Controls/Calendar/Calendar.cs
index 567898dcc..271bd3990 100644
--- a/src/AtomUI.Controls/Calendar/Calendar.cs
+++ b/src/AtomUI.Controls/Calendar/Calendar.cs
@@ -274,10 +274,10 @@ public class Calendar : TemplatedControl,
             defaultBindingMode: BindingMode.TwoWay);
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Calendar, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Calendar>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Calendar, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Calendar>();
 
     /// <summary>
     /// Gets or sets the day that is considered the beginning of the week.
diff --git a/src/AtomUI.Controls/Calendar/HeadTextButton.cs b/src/AtomUI.Controls/Calendar/HeadTextButton.cs
index 0dcd57637..c1fe188fb 100644
--- a/src/AtomUI.Controls/Calendar/HeadTextButton.cs
+++ b/src/AtomUI.Controls/Calendar/HeadTextButton.cs
@@ -11,13 +11,17 @@ using AvaloniaButton = Avalonia.Controls.Button;
 
 internal class HeadTextButton : AvaloniaButton
 {
-    internal static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<HeadTextButton, bool>(nameof(IsMotionEnabled), true);
-    
-    public bool IsMotionEnabled
+    internal static readonly DirectProperty<HeadTextButton, bool> IsMotionEnabledProperty
+        = AvaloniaProperty.RegisterDirect<HeadTextButton, bool>(nameof(IsMotionEnabled),
+            o => o.IsMotionEnabled,
+            (o, v) => o.IsMotionEnabled = v);
+
+    private bool _isMotionEnabled;
+
+    internal bool IsMotionEnabled
     {
-        get => GetValue(IsMotionEnabledProperty);
-        set => SetValue(IsMotionEnabledProperty, value);
+        get => _isMotionEnabled;
+        set => SetAndRaise(IsMotionEnabledProperty, ref _isMotionEnabled, value);
     }
 
     protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
diff --git a/src/AtomUI.Controls/CheckBox/CheckBox.cs b/src/AtomUI.Controls/CheckBox/CheckBox.cs
index f61ea8a5e..dc6ff047d 100644
--- a/src/AtomUI.Controls/CheckBox/CheckBox.cs
+++ b/src/AtomUI.Controls/CheckBox/CheckBox.cs
@@ -17,10 +17,10 @@ public class CheckBox : AvaloniaCheckBox,
     #region 公共属性定义
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<CheckBox, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<CheckBox>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<CheckBox, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<CheckBox>();
     
     public bool IsMotionEnabled
     {
diff --git a/src/AtomUI.Controls/Collapse/Collapse.cs b/src/AtomUI.Controls/Collapse/Collapse.cs
index 571b98dda..f20be53b7 100644
--- a/src/AtomUI.Controls/Collapse/Collapse.cs
+++ b/src/AtomUI.Controls/Collapse/Collapse.cs
@@ -57,10 +57,10 @@ public class Collapse : SelectingItemsControl,
         AvaloniaProperty.Register<Collapse, CollapseExpandIconPosition>(nameof(ExpandIconPosition));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Collapse, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Collapse>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Collapse, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Collapse>();
 
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/ComboBox/ComboBox.cs b/src/AtomUI.Controls/ComboBox/ComboBox.cs
index 029e35be7..0c1f0c5db 100644
--- a/src/AtomUI.Controls/ComboBox/ComboBox.cs
+++ b/src/AtomUI.Controls/ComboBox/ComboBox.cs
@@ -47,10 +47,10 @@ public class ComboBox : AvaloniaComboBox,
         TextBox.IsEnableClearButtonProperty.AddOwner<ComboBox>();
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<ComboBox, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ComboBox>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<ComboBox, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ComboBox>();
 
     public object? LeftAddOn
     {
diff --git a/src/AtomUI.Controls/Drawer/Drawer.cs b/src/AtomUI.Controls/Drawer/Drawer.cs
index 53e1efa33..363f0eb7e 100644
--- a/src/AtomUI.Controls/Drawer/Drawer.cs
+++ b/src/AtomUI.Controls/Drawer/Drawer.cs
@@ -72,10 +72,10 @@ public class Drawer : Control,
         AvaloniaProperty.Register<Drawer, double>(nameof(PushOffsetPercent));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Drawer, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Drawer>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Drawer, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Drawer>();
 
     [Content]
     [DependsOn(nameof(ContentTemplate))]
diff --git a/src/AtomUI.Controls/Expander/Expander.cs b/src/AtomUI.Controls/Expander/Expander.cs
index 4c7451c3b..32e7129bd 100644
--- a/src/AtomUI.Controls/Expander/Expander.cs
+++ b/src/AtomUI.Controls/Expander/Expander.cs
@@ -73,10 +73,10 @@ public class Expander : AvaloniaExpander,
         AvaloniaProperty.Register<Expander, ExpanderIconPosition>(nameof(ExpandIconPosition));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Expander, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Expander>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Expander, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Expander>();
     
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/Flyouts/FlyoutHost.cs b/src/AtomUI.Controls/Flyouts/FlyoutHost.cs
index d72bed40c..d998b8e59 100644
--- a/src/AtomUI.Controls/Flyouts/FlyoutHost.cs
+++ b/src/AtomUI.Controls/Flyouts/FlyoutHost.cs
@@ -64,10 +64,10 @@ public class FlyoutHost : Control,
         Popup.PlacementGravityProperty.AddOwner<FlyoutHost>();
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<FlyoutHost, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<FlyoutHost>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<FlyoutHost, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<FlyoutHost>();
 
     /// <summary>
     /// 距离 anchor 的边距，根据垂直和水平进行设置
diff --git a/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs
index 6ecb6f433..dc2482c0f 100644
--- a/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs
+++ b/src/AtomUI.Controls/Flyouts/MenuFlyoutPresenter.cs
@@ -31,10 +31,10 @@ public class MenuFlyoutPresenter : MenuBase,
             RoutingStrategies.Bubble);
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<MenuFlyoutPresenter, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<MenuFlyoutPresenter>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<MenuFlyoutPresenter, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<MenuFlyoutPresenter>();
 
     /// <summary>
     /// 是否显示指示箭头
diff --git a/src/AtomUI.Controls/Flyouts/PopupFlyoutBase.cs b/src/AtomUI.Controls/Flyouts/PopupFlyoutBase.cs
index 3fd068068..ce3d29bb3 100644
--- a/src/AtomUI.Controls/Flyouts/PopupFlyoutBase.cs
+++ b/src/AtomUI.Controls/Flyouts/PopupFlyoutBase.cs
@@ -28,7 +28,8 @@ public class FlyoutPresenterCreatedEventArgs : EventArgs
 /// <summary>
 /// 最基本得弹窗 Flyout，在这里不处理那种带箭头得
 /// </summary>
-public abstract class PopupFlyoutBase : FlyoutBase, IPopupHostProvider
+public abstract class PopupFlyoutBase : FlyoutBase, 
+                                        IPopupHostProvider
 {
     #region 公共属性定义
 
@@ -78,9 +79,6 @@ public abstract class PopupFlyoutBase : FlyoutBase, IPopupHostProvider
     public static readonly StyledProperty<PopupPositionerConstraintAdjustment> PlacementConstraintAdjustmentProperty =
         Avalonia.Controls.Primitives.Popup.PlacementConstraintAdjustmentProperty.AddOwner<PopupFlyoutBase>();
 
-    public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<PopupFlyoutBase, bool>(nameof(IsMotionEnabled));
-
     public double MarginToAnchor
     {
         get => GetValue(MarginToAnchorProperty);
@@ -147,25 +145,32 @@ public abstract class PopupFlyoutBase : FlyoutBase, IPopupHostProvider
         get => GetValue(PlacementConstraintAdjustmentProperty);
         set => SetValue(PlacementConstraintAdjustmentProperty, value);
     }
-
-    public bool IsMotionEnabled
-    {
-        get => GetValue(IsMotionEnabledProperty);
-        set => SetValue(IsMotionEnabledProperty, value);
-    }
-
+    
     #endregion
 
     #region 内部属性定义
 
     internal static readonly StyledProperty<bool> IsDetectMouseClickEnabledProperty =
-        AvaloniaProperty.Register<Flyout, bool>(nameof(IsDetectMouseClickEnabled), true);
+        AvaloniaProperty.Register<PopupFlyoutBase, bool>(nameof(IsDetectMouseClickEnabled), true);
 
+    internal static readonly DirectProperty<PopupFlyoutBase, bool> IsMotionEnabledProperty
+        = AvaloniaProperty.RegisterDirect<PopupFlyoutBase, bool>(nameof(IsMotionEnabled),
+            o => o.IsMotionEnabled,
+            (o, v) => o.IsMotionEnabled = v);
+    
     internal bool IsDetectMouseClickEnabled
     {
         get => GetValue(IsDetectMouseClickEnabledProperty);
         set => SetValue(IsDetectMouseClickEnabledProperty, value);
     }
+    
+    private bool _isMotionEnabled;
+
+    internal bool IsMotionEnabled
+    {
+        get => _isMotionEnabled;
+        set => SetAndRaise(IsMotionEnabledProperty, ref _isMotionEnabled, value);
+    }
 
     #endregion
 
@@ -625,7 +630,7 @@ public abstract class PopupFlyoutBase : FlyoutBase, IPopupHostProvider
         base.OnPropertyChanged(change);
         if (change.Property == TargetProperty && Target != null)
         {
-            //BindUtils.RelayBind(Target, IsMotionEnabledProperty, this, IsMotionEnabledProperty);
+            BindUtils.RelayBind(Target, AnimationAwareControlProperty.IsMotionEnabledProperty, this, IsMotionEnabledProperty);
         }
     }
 }
\ No newline at end of file
diff --git a/src/AtomUI.Controls/Input/LineEdit.cs b/src/AtomUI.Controls/Input/LineEdit.cs
index 52da06773..6a134bb0b 100644
--- a/src/AtomUI.Controls/Input/LineEdit.cs
+++ b/src/AtomUI.Controls/Input/LineEdit.cs
@@ -17,11 +17,11 @@ public class LineEdit : TextBox,
         AvaloniaProperty.Register<LineEdit, object?>(nameof(RightAddOn));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<LineEdit, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<LineEdit>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<LineEdit, bool>(nameof(IsWaveAnimationEnabled));
-    
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<LineEdit>();
+
     public object? LeftAddOn
     {
         get => GetValue(LeftAddOnProperty);
@@ -45,7 +45,7 @@ public class LineEdit : TextBox,
         get => GetValue(IsWaveAnimationEnabledProperty);
         set => SetValue(IsWaveAnimationEnabledProperty, value);
     }
-    
+
     #endregion
 
     #region 内部属性定义
@@ -58,7 +58,7 @@ public class LineEdit : TextBox,
     {
         this.BindAnimationProperties(IsMotionEnabledProperty, IsWaveAnimationEnabledProperty);
     }
-    
+
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
diff --git a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs b/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs
index a35f6559c..bb2bc08b3 100644
--- a/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs
+++ b/src/AtomUI.Controls/Internal/InfoPickerInput/InfoPickerInput.cs
@@ -73,10 +73,10 @@ public abstract class InfoPickerInput : TemplatedControl,
         AvaloniaProperty.Register<InfoPickerInput, IBrush?>(nameof(InputTextBrush));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<InfoPickerInput, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<InfoPickerInput>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<InfoPickerInput, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<InfoPickerInput>();
 
     public object? LeftAddOn
     {
diff --git a/src/AtomUI.Controls/ListBox/ListBox.cs b/src/AtomUI.Controls/ListBox/ListBox.cs
index 715b499e0..6afaa87ac 100644
--- a/src/AtomUI.Controls/ListBox/ListBox.cs
+++ b/src/AtomUI.Controls/ListBox/ListBox.cs
@@ -24,10 +24,10 @@ public class ListBox : AvaloniaListBox,
         AvaloniaProperty.Register<ListBox, bool>(nameof(DisabledItemHoverEffect));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<ListBox, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ListBox>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<ListBox, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ListBox>();
 
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/Menu/ContextMenu.cs b/src/AtomUI.Controls/Menu/ContextMenu.cs
index c51084047..2b3b21e22 100644
--- a/src/AtomUI.Controls/Menu/ContextMenu.cs
+++ b/src/AtomUI.Controls/Menu/ContextMenu.cs
@@ -17,10 +17,10 @@ public class ContextMenu : AvaloniaContextMenu,
     #region 公共属性定义
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<ContextMenu, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ContextMenu>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<ContextMenu, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ContextMenu>();
 
     public bool IsMotionEnabled
     {
diff --git a/src/AtomUI.Controls/Menu/Menu.cs b/src/AtomUI.Controls/Menu/Menu.cs
index 7e3b680a4..9a789a610 100644
--- a/src/AtomUI.Controls/Menu/Menu.cs
+++ b/src/AtomUI.Controls/Menu/Menu.cs
@@ -21,10 +21,10 @@ public class Menu : AvaloniaMenu,
         AvaloniaProperty.Register<Menu, SizeType>(nameof(SizeType), SizeType.Middle);
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Menu, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Menu>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Menu, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Menu>();
 
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/Message/MessageCard.cs b/src/AtomUI.Controls/Message/MessageCard.cs
index 5bebdb2d3..1aa4b0208 100644
--- a/src/AtomUI.Controls/Message/MessageCard.cs
+++ b/src/AtomUI.Controls/Message/MessageCard.cs
@@ -60,10 +60,10 @@ public class MessageCard : TemplatedControl,
         AvaloniaProperty.Register<MessageCard, string>(nameof(Message));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<MessageCard, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<MessageCard>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<MessageCard, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<MessageCard>();
 
     /// <summary>
     /// Determines if the notification is already closing.
diff --git a/src/AtomUI.Controls/Message/WindowMessageManager.cs b/src/AtomUI.Controls/Message/WindowMessageManager.cs
index a3cc8d243..e34166559 100644
--- a/src/AtomUI.Controls/Message/WindowMessageManager.cs
+++ b/src/AtomUI.Controls/Message/WindowMessageManager.cs
@@ -28,10 +28,10 @@ public class WindowMessageManager : TemplatedControl,
             nameof(Position), NotificationPosition.TopRight);
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<WindowMessageManager, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<WindowMessageManager>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<WindowMessageManager, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<WindowMessageManager>();
 
     /// <summary>
     /// Defines which corner of the screen notifications can be displayed in.
diff --git a/src/AtomUI.Controls/NavMenu/NavMenuBase.cs b/src/AtomUI.Controls/NavMenu/NavMenuBase.cs
index 0fc7a4fbc..d8bcad432 100644
--- a/src/AtomUI.Controls/NavMenu/NavMenuBase.cs
+++ b/src/AtomUI.Controls/NavMenu/NavMenuBase.cs
@@ -27,10 +27,10 @@ public abstract class NavMenuBase : SelectingItemsControl,
             o => o.IsOpen);
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<NavMenuBase, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<NavMenuBase>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<NavMenuBase, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<NavMenuBase>();
 
     private bool _isOpen;
 
diff --git a/src/AtomUI.Controls/Notifications/NotificationCard.cs b/src/AtomUI.Controls/Notifications/NotificationCard.cs
index 704757b61..7c93ee6d8 100644
--- a/src/AtomUI.Controls/Notifications/NotificationCard.cs
+++ b/src/AtomUI.Controls/Notifications/NotificationCard.cs
@@ -53,10 +53,10 @@ public class NotificationCard : ContentControl,
         AvaloniaProperty.Register<NotificationCard, NotificationType>(nameof(NotificationType));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<NotificationCard, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<NotificationCard>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<NotificationCard, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<NotificationCard>();
 
     /// <summary>
     /// Defines the <see cref="NotificationClosed" /> event.
diff --git a/src/AtomUI.Controls/Notifications/WindowNotificationManager.cs b/src/AtomUI.Controls/Notifications/WindowNotificationManager.cs
index 305a0d253..18a8e1160 100644
--- a/src/AtomUI.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/AtomUI.Controls/Notifications/WindowNotificationManager.cs
@@ -38,10 +38,10 @@ public class WindowNotificationManager : TemplatedControl,
             nameof(Position), NotificationPosition.TopRight);
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<WindowNotificationManager, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<WindowNotificationManager>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<WindowNotificationManager, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<WindowNotificationManager>();
 
     public static readonly StyledProperty<int> MaxItemsProperty =
         AvaloniaProperty.Register<WindowNotificationManager, int>(nameof(MaxItems), 5);
diff --git a/src/AtomUI.Controls/NumericUpDown/NumericUpDown.cs b/src/AtomUI.Controls/NumericUpDown/NumericUpDown.cs
index 70c115df5..045b1d2ae 100644
--- a/src/AtomUI.Controls/NumericUpDown/NumericUpDown.cs
+++ b/src/AtomUI.Controls/NumericUpDown/NumericUpDown.cs
@@ -30,12 +30,12 @@ public class NumericUpDown : AvaloniaNumericUpDown,
 
     public static readonly StyledProperty<bool> IsEnableClearButtonProperty =
         TextBox.IsEnableClearButtonProperty.AddOwner<NumericUpDown>();
-    
+
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<NumericUpDown, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<NumericUpDown>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<NumericUpDown, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<NumericUpDown>();
 
     public object? LeftAddOn
     {
diff --git a/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs b/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs
index afb23186a..42a735529 100644
--- a/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs
+++ b/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs
@@ -42,10 +42,10 @@ public class OptionButtonGroup : SelectingItemsControl,
         AvaloniaProperty.Register<OptionButtonGroup, OptionButtonStyle>(nameof(SizeType));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<OptionButtonGroup, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<OptionButtonGroup>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<OptionButtonGroup, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<OptionButtonGroup>();
 
     public static readonly RoutedEvent<OptionCheckedChangedEventArgs> OptionCheckedChangedEvent =
         RoutedEvent.Register<OptionButtonGroup, OptionCheckedChangedEventArgs>(
diff --git a/src/AtomUI.Controls/Popup/Popup.cs b/src/AtomUI.Controls/Popup/Popup.cs
index cc01a27c5..32e031480 100644
--- a/src/AtomUI.Controls/Popup/Popup.cs
+++ b/src/AtomUI.Controls/Popup/Popup.cs
@@ -44,10 +44,10 @@ public class Popup : AvaloniaPopup,
             (o, v) => o.IsFlipped = v);
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Popup, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Popup>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Popup, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Popup>();
 
     public BoxShadows MaskShadows
     {
diff --git a/src/AtomUI.Controls/ProgressBar/AbstractProgressBar.cs b/src/AtomUI.Controls/ProgressBar/AbstractProgressBar.cs
index 924bf1f78..72e8baafa 100644
--- a/src/AtomUI.Controls/ProgressBar/AbstractProgressBar.cs
+++ b/src/AtomUI.Controls/ProgressBar/AbstractProgressBar.cs
@@ -92,10 +92,10 @@ public abstract class AbstractProgressBar : RangeBase,
         AvaloniaProperty.Register<AbstractProgressBar, IBrush?>(nameof(SuccessThresholdBrush));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<AbstractProgressBar, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<AbstractProgressBar>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<AbstractProgressBar, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<AbstractProgressBar>();
 
     /// <summary>
     /// Gets or sets a value indicating whether the progress bar shows the actual value or a generic,
diff --git a/src/AtomUI.Controls/RadioButton/RadioButton.cs b/src/AtomUI.Controls/RadioButton/RadioButton.cs
index 09abb0b45..ca05925d7 100644
--- a/src/AtomUI.Controls/RadioButton/RadioButton.cs
+++ b/src/AtomUI.Controls/RadioButton/RadioButton.cs
@@ -16,10 +16,10 @@ public class RadioButton : AvaloniaRadioButton,
     #region 公共属性定义
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<RadioButton, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<RadioButton>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<RadioButton, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<RadioButton>();
     
     public bool IsMotionEnabled
     {
diff --git a/src/AtomUI.Controls/Segmented/Segmented.cs b/src/AtomUI.Controls/Segmented/Segmented.cs
index 1a32f0942..3e4222cdc 100644
--- a/src/AtomUI.Controls/Segmented/Segmented.cs
+++ b/src/AtomUI.Controls/Segmented/Segmented.cs
@@ -29,10 +29,10 @@ public class Segmented : SelectingItemsControl,
         AvaloniaProperty.Register<Segmented, bool>(nameof(IsExpanding));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Segmented, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Segmented>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Segmented, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Segmented>();
 
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/Slider/Slider.cs b/src/AtomUI.Controls/Slider/Slider.cs
index 5016e49de..eee4de623 100644
--- a/src/AtomUI.Controls/Slider/Slider.cs
+++ b/src/AtomUI.Controls/Slider/Slider.cs
@@ -131,7 +131,13 @@ public class Slider : RangeBase,
 
     public static readonly StyledProperty<bool> IncludedProperty =
         SliderTrack.IncludedProperty.AddOwner<Slider>();
+    
+    public static readonly StyledProperty<bool> IsMotionEnabledProperty
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Slider>();
 
+    public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Slider>();
+    
     /// <summary>
     /// Gets or sets the orientation of a <see cref="Slider" />.
     /// </summary>
@@ -202,16 +208,7 @@ public class Slider : RangeBase,
         get => GetValue(IncludedProperty);
         set => SetValue(IncludedProperty, value);
     }
-
-    #endregion
-
-    #region 内部属性定义
-    public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Slider, bool>(nameof(IsMotionEnabled));
-
-    public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Slider, bool>(nameof(IsWaveAnimationEnabled));
-
+    
     public bool IsMotionEnabled
     {
         get => GetValue(IsMotionEnabledProperty);
@@ -223,6 +220,10 @@ public class Slider : RangeBase,
         get => GetValue(IsWaveAnimationEnabledProperty);
         set => SetValue(IsWaveAnimationEnabledProperty, value);
     }
+
+    #endregion
+
+    #region 内部属性定义
     
     Control IAnimationAwareControl.PropertyBindTarget => this;
     Control IControlSharedTokenResourcesHost.HostControl => this;
diff --git a/src/AtomUI.Controls/Switch/ToggleSwitch.cs b/src/AtomUI.Controls/Switch/ToggleSwitch.cs
index 822665b33..926f8b69a 100644
--- a/src/AtomUI.Controls/Switch/ToggleSwitch.cs
+++ b/src/AtomUI.Controls/Switch/ToggleSwitch.cs
@@ -49,19 +49,19 @@ public class ToggleSwitch : ToggleButton,
     /// 设置预置的大小类型
     /// </summary>
     public static readonly StyledProperty<SizeType> SizeTypeProperty =
-        AvaloniaProperty.Register<Button, SizeType>(nameof(SizeType), SizeType.Middle);
+        AvaloniaProperty.Register<ToggleSwitch, SizeType>(nameof(SizeType), SizeType.Middle);
 
     /// <summary>
     /// 是否处于加载状态
     /// </summary>
     public static readonly StyledProperty<bool> IsLoadingProperty =
-        AvaloniaProperty.Register<Button, bool>(nameof(IsLoading));
+        AvaloniaProperty.Register<ToggleSwitch, bool>(nameof(IsLoading));
     
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Button, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ToggleSwitch>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Button, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ToggleSwitch>();
 
     /// <summary>
     /// Gets or Sets the Content that is displayed when in the On State.
diff --git a/src/AtomUI.Controls/TabControl/BaseTabControl.cs b/src/AtomUI.Controls/TabControl/BaseTabControl.cs
index d8afeefad..492c4d39c 100644
--- a/src/AtomUI.Controls/TabControl/BaseTabControl.cs
+++ b/src/AtomUI.Controls/TabControl/BaseTabControl.cs
@@ -36,10 +36,10 @@ public class BaseTabControl : AvaloniaTabControl,
         AvaloniaProperty.Register<BaseTabControl, bool>(nameof(TabAlignmentCenter));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<BaseTabControl, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<BaseTabControl>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<BaseTabControl, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<BaseTabControl>();
 
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs b/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs
index 1ed2e9cfc..1d1a48275 100644
--- a/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs
+++ b/src/AtomUI.Controls/TabControl/TabStrip/BaseTabStrip.cs
@@ -41,10 +41,10 @@ public abstract class BaseTabStrip : AvaloniaTabStrip,
         AvaloniaProperty.Register<BaseTabStrip, bool>(nameof(TabAlignmentCenter));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<BaseTabStrip, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<BaseTabStrip>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<BaseTabStrip, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<BaseTabStrip>();
     
     public SizeType SizeType
     {
diff --git a/src/AtomUI.Controls/Tooltip/ToolTip.cs b/src/AtomUI.Controls/Tooltip/ToolTip.cs
index 1bb05302f..9aa9afd31 100644
--- a/src/AtomUI.Controls/Tooltip/ToolTip.cs
+++ b/src/AtomUI.Controls/Tooltip/ToolTip.cs
@@ -81,10 +81,10 @@ public class ToolTip : ContentControl,
         AvaloniaProperty.RegisterAttached<ToolTip, Control, bool>("IsCustomHide");
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<ToolTip, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<ToolTip>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<ToolTip, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<ToolTip>();
 
     public bool IsMotionEnabled
     {
diff --git a/src/AtomUI.Controls/TreeView/TreeView.cs b/src/AtomUI.Controls/TreeView/TreeView.cs
index 4421e158d..0846810d1 100644
--- a/src/AtomUI.Controls/TreeView/TreeView.cs
+++ b/src/AtomUI.Controls/TreeView/TreeView.cs
@@ -52,12 +52,12 @@ public class TreeView : AvaloniaTreeView,
 
     public static readonly StyledProperty<bool> IsShowLeafIconProperty =
         AvaloniaProperty.Register<TreeView, bool>(nameof(IsShowLeafIcon));
-    
+
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<TreeView, bool>(nameof(IsMotionEnabled));
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<TreeView>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<TreeView, bool>(nameof(IsWaveAnimationEnabled));
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<TreeView>();
 
     public bool IsDraggable
     {
diff --git a/src/AtomUI.IconPkg/Icon.cs b/src/AtomUI.IconPkg/Icon.cs
index 28f774318..d54c33bf0 100644
--- a/src/AtomUI.IconPkg/Icon.cs
+++ b/src/AtomUI.IconPkg/Icon.cs
@@ -62,10 +62,10 @@ public class Icon : Control,
         AvaloniaProperty.Register<Icon, IconMode>(nameof(IconMode));
 
     public static readonly StyledProperty<bool> IsMotionEnabledProperty
-        = AvaloniaProperty.Register<Icon, bool>(nameof(IsMotionEnabled), true);
+        = AnimationAwareControlProperty.IsMotionEnabledProperty.AddOwner<Icon>();
 
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
-        = AvaloniaProperty.Register<Icon, bool>(nameof(IsWaveAnimationEnabled), true);
+        = AnimationAwareControlProperty.IsWaveAnimationEnabledProperty.AddOwner<Icon>();
 
     public IconInfo? IconInfo
     {
diff --git a/src/AtomUI.Theme/IAnimationAwareControl.cs b/src/AtomUI.Theme/IAnimationAwareControl.cs
index 4639aeeaf..3b54ff186 100644
--- a/src/AtomUI.Theme/IAnimationAwareControl.cs
+++ b/src/AtomUI.Theme/IAnimationAwareControl.cs
@@ -22,4 +22,4 @@ public abstract class AnimationAwareControlProperty : AvaloniaObject
     public static readonly StyledProperty<bool> IsWaveAnimationEnabledProperty
         = AvaloniaProperty.Register<AnimationAwareControlProperty, bool>(IAnimationAwareControl
             .IsWaveAnimationEnabledPropertyName);
-}
\ No newline at end of file
+}