Refactor IMotionAwareControl

2026-10-28 23:08:36 +08:00 · 2025-12-18 10:58:47 +08:00
parent 08d4e19018
commit 057f61de55
73 changed files with 30 additions and 121 deletions
@@ -46,7 +46,6 @@ public class IconPresenter : Control, IMotionAwareControl

    #endregion
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    private CompositeDisposable? _disposables;
    
    static IconPresenter()
@@ -1,12 +1,10 @@
 using Avalonia;
-using Avalonia.Controls;

 namespace AtomUI.Controls;

 public interface IMotionAwareControl
 {
    bool IsMotionEnabled { get; }
-    Control PropertyBindTarget { get; }
 }

 public abstract class MotionAwareControlProperty
@@ -165,8 +165,6 @@ public abstract class Icon : PathIcon, ICustomHitTest, IMotionAwareControl
    protected virtual IList<DrawingInstruction> DrawingInstructions { get; } = Array.Empty<DrawingInstruction>();
    protected Rect ViewBox;

-    Control IMotionAwareControl.PropertyBindTarget => this;
-
    private Animation? _animation;
    private CancellationTokenSource? _animationCancellationTokenSource;
    protected readonly IBrush?[] DrawBrushes = new IBrush[5];
@@ -213,8 +213,7 @@ public abstract class AbstractColorPicker : AvaloniaButton,
        get => _colorBlockBackground;
        set => SetAndRaise(ColorBlockBackgroundProperty, ref _colorBlockBackground, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ColorPickerToken.ID;
    
@@ -216,7 +216,6 @@ public abstract class AbstractColorPickerView : TemplatedControl,
        set => SetAndRaise(IsAlphaEffectiveVisibleProperty, ref _isAlphaEffectiveVisible, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ColorPickerToken.ID;
    #endregion
@@ -240,8 +240,7 @@ public partial class DataGrid

    internal ScrollBar? VerticalScrollBar => _vScrollBar;
    internal ScrollBar? HorizontalScrollBar => _hScrollBar;
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => DataGridToken.ID;

@@ -149,8 +149,7 @@ public class Avatar : TemplatedControl, IControlSharedTokenResourcesHost, IMotio
        get => _contentType;
        set => SetAndRaise(ContentTypeProperty, ref _contentType, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;

@@ -117,8 +117,7 @@ public class AvatarGroup : TemplatedControl,
        get => GetValue(GroupOverlappingProperty);
        set => SetValue(GroupOverlappingProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;
    #endregion
@@ -116,7 +116,6 @@ public class CountBadge : Control,

    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => BadgeToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion

@@ -102,7 +102,6 @@ public class DotBadge : Control,
    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => BadgeToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion

@@ -56,8 +56,7 @@ public class Breadcrumb : ItemsControl, IControlSharedTokenResourcesHost, IMotio
    #endregion

    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => BreadcrumbToken.ID;

@@ -193,7 +193,6 @@ public class ButtonSpinner : Spinner,
    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonSpinnerToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion
    
@@ -182,8 +182,7 @@ public class Button : AvaloniaButton,
        get => GetValue(WaveSpiritTypeProperty);
        set => SetValue(WaveSpiritTypeProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;
    
@@ -102,7 +102,6 @@ public class HyperLinkButton : AvaloniaButton,

    #endregion
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;

@@ -99,8 +99,7 @@ public class IconButton : AvaloniaButton,
        get => GetValue(IsPassthroughMouseEventProperty);
        set => SetValue(IsPassthroughMouseEventProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;

@@ -266,8 +266,7 @@ public class SplitButton : ContentControl,
        get => _effectiveButtonType;
        set => SetAndRaise(EffectiveButtonTypeProperty, ref _effectiveButtonType, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;
    
@@ -115,7 +115,7 @@ public class ToggleIconButton : ToggleButton,
    #endregion
    
    #region 内部属性定义
-    Control IMotionAwareControl.PropertyBindTarget => this;
+
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;
    
@@ -587,7 +587,6 @@ public class Calendar : TemplatedControl,
    }

    internal DateTime DisplayDateInternal { get; set; }
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => CalendarToken.ID;

@@ -145,7 +145,6 @@ public class Card : HeaderedContentControl,

    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => CardToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;
    
    internal static readonly DirectProperty<Card, Thickness> HeaderBorderThicknessProperty =
        AvaloniaProperty.RegisterDirect<Card, Thickness>(
@@ -246,8 +246,7 @@ public class Carousel : SelectingItemsControl,
        get => GetValue(PaginationOffsetProperty);
        set => SetValue(PaginationOffsetProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => CarouselToken.ID;

@@ -33,8 +33,7 @@ public class CheckBox : AvaloniaCheckBox, IWaveSpiritAwareControl, IControlShare
    #endregion
    
    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => CheckBoxToken.ID;

@@ -126,8 +126,7 @@ internal class TitleBar : TemplatedControl,
    #endregion

    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ChromeToken.ID;

@@ -139,8 +139,7 @@ public class Collapse : SelectingItemsControl,
        {
            Orientation = Orientation.Vertical
        });
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => CollapseToken.ID;

@@ -194,8 +194,7 @@ public class ComboBox : AvaloniaComboBox,
        get => GetValue(PopupContentPaddingProperty);
        set => SetValue(PopupContentPaddingProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ComboBoxToken.ID;

@@ -251,7 +251,6 @@ public class DialogButtonBox : TemplatedControl,
    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => DialogToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;
    #endregion

    private DockPanel? _leftGroup;
@@ -393,7 +393,6 @@ public partial class Dialog : TemplatedControl,
        set => SetAndRaise(EffectiveMinimizableProperty, ref _effectiveMinimizable, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => DialogToken.ID;
    
@@ -110,8 +110,6 @@ internal class OverlayDialogHeader : TemplatedControl, IMotionAwareControl
    }
    
    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
    
    internal static readonly DirectProperty<OverlayDialogHeader, bool> IsDialogMaximizedProperty =
        AvaloniaProperty.RegisterDirect<OverlayDialogHeader, bool>(
@@ -229,7 +229,6 @@ internal class OverlayDialogHost : ContentControl,
        set => SetAndRaise(IsHostAnimatingProperty, ref _isHostAnimating, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    internal bool IsHidden => _dialogLayer.Children.Contains(this);
    
    #endregion
@@ -147,8 +147,6 @@ internal class DialogHost : Window,
        set => SetAndRaise(IsEffectiveFooterVisibleProperty, ref _isEffectiveFooterVisible, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
-    
    #endregion
    
    protected override Type StyleKeyOverride { get; } = typeof(DialogHost);
@@ -204,8 +204,7 @@ public class Drawer : Control,
        get => _effectiveDialogSize;
        set => SetAndRaise(EffectiveDialogSizeProperty, ref _effectiveDialogSize, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => DrawerToken.ID;

@@ -190,7 +190,6 @@ public class Expander : AvaloniaExpander,
        set => SetAndRaise(EffectiveBorderThicknessProperty, ref _effectiveBorderThickness, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ExpanderToken.ID;
    
@@ -168,12 +168,6 @@ public class FlyoutHost : ContentControl, IMotionAwareControl
        set => SetValue(CloseMotionProperty, value);
    }

-    #endregion
-
-    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
-
    #endregion
    
    private readonly FlyoutStateHelper _flyoutStateHelper;
@@ -118,7 +118,6 @@ public class MenuFlyoutPresenter : MenuBase,
        set => SetValue(MaxPopupHeightProperty, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;

@@ -61,8 +61,7 @@ public class TreeViewFlyoutPresenter : FloatableTreeView,
    #endregion
        
    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;
    
@@ -241,8 +241,7 @@ public class AbstractImagePreviewer : TemplatedControl,
        get => _effectiveSources;
        set => SetAndRaise(EffectiveSourcesProperty, ref _effectiveSources, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ImagePreviewerToken.ID;
    
@@ -41,8 +41,6 @@ internal class ImagePreviewerCover : TemplatedControl, IMotionAwareControl
        set => SetValue(MaskOpacityProperty, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
-
    #endregion
    
    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -292,8 +292,6 @@ internal class ImagePreviewerDialog : Window,
        set => SetAndRaise(IsImageFitToWindowProperty, ref _isImageFitToWindow, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
-    
    #endregion
    
    protected override Type StyleKeyOverride { get; } = typeof(ImagePreviewerDialog);
@@ -274,7 +274,6 @@ internal class ImageViewer : TemplatedControl, IMotionAwareControl
        set => SetAndRaise(IsImageFitToWindowProperty, ref _isImageFitToWindow, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    #endregion
    
    private ImagePreviewRenderer? _image;
@@ -166,7 +166,6 @@ public class TextArea : AvaloniaTextBox,
    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => LineEditToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion

@@ -113,7 +113,6 @@ public class TextBox : AvaloniaTextBox,
    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => LineEditToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;
    #endregion
    
    private IconButton? _clearButton;
@@ -405,7 +405,6 @@ public class List : TemplatedControl,
        private set;
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ListToken.ID;

@@ -91,7 +91,7 @@ public class ContextMenu : AvaloniaContextMenu,
        get => GetValue(MaxPopupHeightProperty);
        set => SetValue(MaxPopupHeightProperty, value);
    }
-    Control IMotionAwareControl.PropertyBindTarget => this;
+
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;

@@ -63,8 +63,7 @@ public class Menu : AvaloniaMenu,
    #endregion

    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID;
    #endregion
@@ -131,8 +131,7 @@ public class MessageCard : TemplatedControl,
        get => _openCloseMotionDuration;
        set => SetAndRaise(OpenCloseMotionDurationProperty, ref _openCloseMotionDuration, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => MessageToken.ID;

@@ -66,8 +66,7 @@ public class WindowMessageManager : TemplatedControl,
    #endregion

    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => MessageToken.ID;

@@ -232,7 +232,6 @@ public class MessageBox : TemplatedControl,
    
    #region 内部属性定义
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => DialogToken.ID;
    
@@ -194,7 +194,6 @@ public class NavMenu : ItemsControl,
        set => SetValue(HorizontalBorderThicknessProperty, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => NavMenuToken.ID;
    
@@ -141,8 +141,7 @@ public class NotificationCard : ContentControl,
        get => _openCloseMotionDuration;
        set => SetAndRaise(OpenCloseMotionDurationProperty, ref _openCloseMotionDuration, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => NotificationToken.ID;

@@ -73,8 +73,7 @@ public class WindowNotificationManager : TemplatedControl,
    #endregion
    
    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => NotificationToken.ID;

@@ -151,8 +151,7 @@ public class NumericUpDown : AvaloniaNumericUpDown, IMotionAwareControl, IContro
        get => _isEffectiveShowClearButton;
        set => SetAndRaise(IsEffectiveShowClearButtonProperty, ref _isEffectiveShowClearButton, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => NumericUpDownToken.ID;
    
@@ -118,8 +118,7 @@ public class OptionButtonGroup : SelectingItemsControl,
        {
            Orientation = Orientation.Horizontal
        });
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => OptionButtonToken.ID;

@@ -105,8 +105,6 @@ public abstract class AbstractPagination : TemplatedControl, ISizeTypeAware, IMo
        return allowPageSizes.Contains(pageSize);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
-    
    #endregion
    
    protected bool TemplateConfigured = false;
@@ -140,9 +140,7 @@ public class Popup : AvaloniaPopup, IMotionAwareControl
        get => GetValue(IsDetectMouseClickEnabledProperty);
        set => SetValue(IsDetectMouseClickEnabledProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
-
+    
    #endregion

    internal BaseMotionActor? MotionActor;
@@ -263,8 +263,6 @@ internal class AddOnDecoratedBox : ContentControl,

    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => AddOnDecoratedBoxToken.ID;
-    
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion
    
@@ -170,7 +170,6 @@ public class ArrowDecoratedBox : ContentControl,

    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ArrowDecoratedBoxToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;
    
    private Rect _arrowIndicatorBounds;

@@ -29,7 +29,6 @@ internal class IndicatorScrollViewer : ScrollViewer, IMotionAwareControl, IContr
    }
    #region 内部属性定义
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID;

@@ -254,7 +254,6 @@ public abstract class InfoPickerInput : TemplatedControl,

    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => InfoPickerInputToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion

@@ -41,7 +41,6 @@ internal class SizeTypeAwareIconPresenter : TemplatedControl, ISizeTypeAware, IM
    }
    #endregion
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    
    static SizeTypeAwareIconPresenter()
    {
@@ -257,8 +257,7 @@ public abstract class AbstractProgressBar : RangeBase,
        get => GetValue(IsCompletedProperty);
        set => SetValue(IsCompletedProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ProgressBarToken.ID;

@@ -36,8 +36,7 @@ public class RadioButton : AvaloniaRadioButton,
    #endregion
    
    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => RadioButtonToken.ID;

@@ -154,7 +154,6 @@ public class Rate : TemplatedControl,
        set => SetAndRaise(EffectiveValueProperty, ref _effectiveValue, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => RateToken.ID;
    #endregion
@@ -101,7 +101,6 @@ public class Segmented : SelectingItemsControl,
        set => SetValue(SelectedThumbPosProperty, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => SegmentedToken.ID;
    
@@ -541,7 +541,6 @@ public class Select : TemplatedControl,
        set => SetAndRaise(IsEffectiveSearchEnabledProperty, ref _isEffectiveSearchEnabled, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => SelectToken.ID;

@@ -197,8 +197,7 @@ public class Slider : RangeBase,
    #endregion

    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => SliderToken.ID;

@@ -140,7 +140,6 @@ public class Spin : ContentControl, IMotionAwareControl
        set => SetValue(MaskOpacityProperty, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    #endregion

    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -206,7 +206,6 @@ public class Steps : SelectingItemsControl,
        set => SetValue(VerticalItemSpacingProperty, value);
    }

-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => StepsToken.ID;

@@ -249,8 +249,7 @@ public class ToggleSwitch : ToggleButton,
        get => GetValue(SwitchOpacityProperty);
        set => SetValue(SwitchOpacityProperty, value);
    }
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
+    
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ToggleSwitchToken.ID;

@@ -257,7 +257,6 @@ public class BaseTabControl : SelectingItemsControl,

    internal ContentPresenter? ContentPart { get; private set; }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => TabControlToken.ID;
    
@@ -177,7 +177,6 @@ public abstract class BaseTabStrip : AvaloniaTabStrip,
    
    private protected readonly Dictionary<TabStripItem, CompositeDisposable> ItemsBindingDisposables = new();
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => TabControlToken.ID;
    
@@ -155,8 +155,6 @@ public class HyperLinkTextBlock : TemplatedControl, IMotionAwareControl
        set => SetValue(ClickModeProperty, value);
    }

-    Control IMotionAwareControl.PropertyBindTarget => this;
-
    #endregion
    
    private bool _commandCanExecute = true;
@@ -318,7 +318,6 @@ public class ToolTip : ContentControl,

    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => ToolTipToken.ID;
-    Control IMotionAwareControl.PropertyBindTarget => this;

    #endregion

@@ -223,7 +223,6 @@ public partial class TreeView : AvaloniaTreeView, IMotionAwareControl, IControlS
        set => SetValue(MotionDurationProperty, value);
    }
    
-    Control IMotionAwareControl.PropertyBindTarget => this;
    Control IControlSharedTokenResourcesHost.HostControl => this;
    string IControlSharedTokenResourcesHost.TokenId => TreeViewToken.ID;
    
@@ -28,12 +28,6 @@ internal class UploadList : ItemsControl, IMotionAwareControl
        set => SetValue(IsMotionEnabledProperty, value);
    }
    
-    #endregion
-
-    #region 内部属性定义
-
-    Control IMotionAwareControl.PropertyBindTarget => this;
-
    #endregion
    
    private readonly Dictionary<AbstractUploadListItem, CompositeDisposable> _itemsBindingDisposables = new();