diff --git a/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs b/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs index 14b0c16d9..e72acb3d1 100644 --- a/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs +++ b/src/AtomUI.Controls.Shared/Icon/IconPresenter.cs @@ -46,7 +46,6 @@ public class IconPresenter : Control, IMotionAwareControl #endregion - Control IMotionAwareControl.PropertyBindTarget => this; private CompositeDisposable? _disposables; static IconPresenter() diff --git a/src/AtomUI.Core/Controls/IMotionAwareControl.cs b/src/AtomUI.Core/Controls/IMotionAwareControl.cs index 25928b4a5..08a55e2e6 100644 --- a/src/AtomUI.Core/Controls/IMotionAwareControl.cs +++ b/src/AtomUI.Core/Controls/IMotionAwareControl.cs @@ -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 diff --git a/src/AtomUI.Core/Controls/Icon/Icon.cs b/src/AtomUI.Core/Controls/Icon/Icon.cs index 9f0721b5d..570e541b4 100644 --- a/src/AtomUI.Core/Controls/Icon/Icon.cs +++ b/src/AtomUI.Core/Controls/Icon/Icon.cs @@ -165,8 +165,6 @@ public abstract class Icon : PathIcon, ICustomHitTest, IMotionAwareControl protected virtual IList DrawingInstructions { get; } = Array.Empty(); protected Rect ViewBox; - Control IMotionAwareControl.PropertyBindTarget => this; - private Animation? _animation; private CancellationTokenSource? _animationCancellationTokenSource; protected readonly IBrush?[] DrawBrushes = new IBrush[5]; diff --git a/src/AtomUI.Desktop.Controls.ColorPicker/AbstractColorPicker.cs b/src/AtomUI.Desktop.Controls.ColorPicker/AbstractColorPicker.cs index 5db31a567..3a5d556a8 100644 --- a/src/AtomUI.Desktop.Controls.ColorPicker/AbstractColorPicker.cs +++ b/src/AtomUI.Desktop.Controls.ColorPicker/AbstractColorPicker.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls.ColorPicker/ColorView/AbstractColorPickerView.cs b/src/AtomUI.Desktop.Controls.ColorPicker/ColorView/AbstractColorPickerView.cs index b89df2bb1..426007102 100644 --- a/src/AtomUI.Desktop.Controls.ColorPicker/ColorView/AbstractColorPickerView.cs +++ b/src/AtomUI.Desktop.Controls.ColorPicker/ColorView/AbstractColorPickerView.cs @@ -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 diff --git a/src/AtomUI.Desktop.Controls.DataGrid/DataGrid.Privates.cs b/src/AtomUI.Desktop.Controls.DataGrid/DataGrid.Privates.cs index fb202c852..7f334ce6e 100644 --- a/src/AtomUI.Desktop.Controls.DataGrid/DataGrid.Privates.cs +++ b/src/AtomUI.Desktop.Controls.DataGrid/DataGrid.Privates.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Avatar/Avatar.cs b/src/AtomUI.Desktop.Controls/Avatar/Avatar.cs index dfa38a1e6..f0a0319b6 100644 --- a/src/AtomUI.Desktop.Controls/Avatar/Avatar.cs +++ b/src/AtomUI.Desktop.Controls/Avatar/Avatar.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Avatar/AvatarGroup.cs b/src/AtomUI.Desktop.Controls/Avatar/AvatarGroup.cs index c89b2a78e..e162c910c 100644 --- a/src/AtomUI.Desktop.Controls/Avatar/AvatarGroup.cs +++ b/src/AtomUI.Desktop.Controls/Avatar/AvatarGroup.cs @@ -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 diff --git a/src/AtomUI.Desktop.Controls/Badge/CountBadge.cs b/src/AtomUI.Desktop.Controls/Badge/CountBadge.cs index cf37c33ee..d958ceb78 100644 --- a/src/AtomUI.Desktop.Controls/Badge/CountBadge.cs +++ b/src/AtomUI.Desktop.Controls/Badge/CountBadge.cs @@ -116,7 +116,6 @@ public class CountBadge : Control, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => BadgeToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/Badge/DotBadge.cs b/src/AtomUI.Desktop.Controls/Badge/DotBadge.cs index cae8c1df7..64776cc07 100644 --- a/src/AtomUI.Desktop.Controls/Badge/DotBadge.cs +++ b/src/AtomUI.Desktop.Controls/Badge/DotBadge.cs @@ -102,7 +102,6 @@ public class DotBadge : Control, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => BadgeToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/Breadcrumb/Breadcrumb.cs b/src/AtomUI.Desktop.Controls/Breadcrumb/Breadcrumb.cs index 725ccac84..69c583565 100644 --- a/src/AtomUI.Desktop.Controls/Breadcrumb/Breadcrumb.cs +++ b/src/AtomUI.Desktop.Controls/Breadcrumb/Breadcrumb.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs index c0d819e9e..5a2ebd5ea 100644 --- a/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs +++ b/src/AtomUI.Desktop.Controls/ButtonSpinner/ButtonSpinner.cs @@ -193,7 +193,6 @@ public class ButtonSpinner : Spinner, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ButtonSpinnerToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/Buttons/Button.cs b/src/AtomUI.Desktop.Controls/Buttons/Button.cs index 64ad30b94..2d85d76ac 100644 --- a/src/AtomUI.Desktop.Controls/Buttons/Button.cs +++ b/src/AtomUI.Desktop.Controls/Buttons/Button.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Buttons/HyperLinkButton.cs b/src/AtomUI.Desktop.Controls/Buttons/HyperLinkButton.cs index 1b80bb235..ae844b67e 100644 --- a/src/AtomUI.Desktop.Controls/Buttons/HyperLinkButton.cs +++ b/src/AtomUI.Desktop.Controls/Buttons/HyperLinkButton.cs @@ -102,7 +102,6 @@ public class HyperLinkButton : AvaloniaButton, #endregion - Control IMotionAwareControl.PropertyBindTarget => this; Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs b/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs index 3b6f05699..bab223513 100644 --- a/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs +++ b/src/AtomUI.Desktop.Controls/Buttons/IconButton.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Buttons/SplitButton.cs b/src/AtomUI.Desktop.Controls/Buttons/SplitButton.cs index 9125cb9fa..e85d0c3ac 100644 --- a/src/AtomUI.Desktop.Controls/Buttons/SplitButton.cs +++ b/src/AtomUI.Desktop.Controls/Buttons/SplitButton.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Buttons/ToggleIconButton.cs b/src/AtomUI.Desktop.Controls/Buttons/ToggleIconButton.cs index be10b9c81..834f69fd8 100644 --- a/src/AtomUI.Desktop.Controls/Buttons/ToggleIconButton.cs +++ b/src/AtomUI.Desktop.Controls/Buttons/ToggleIconButton.cs @@ -115,7 +115,7 @@ public class ToggleIconButton : ToggleButton, #endregion #region 内部属性定义 - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Calendar/Calendar.cs b/src/AtomUI.Desktop.Controls/Calendar/Calendar.cs index 39fa38aa9..d97f971cc 100644 --- a/src/AtomUI.Desktop.Controls/Calendar/Calendar.cs +++ b/src/AtomUI.Desktop.Controls/Calendar/Calendar.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Card/Card.cs b/src/AtomUI.Desktop.Controls/Card/Card.cs index 02c03acf5..7e878908b 100644 --- a/src/AtomUI.Desktop.Controls/Card/Card.cs +++ b/src/AtomUI.Desktop.Controls/Card/Card.cs @@ -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 HeaderBorderThicknessProperty = AvaloniaProperty.RegisterDirect( diff --git a/src/AtomUI.Desktop.Controls/Carousel/Carousel.cs b/src/AtomUI.Desktop.Controls/Carousel/Carousel.cs index 9f9a85ca6..2264253eb 100644 --- a/src/AtomUI.Desktop.Controls/Carousel/Carousel.cs +++ b/src/AtomUI.Desktop.Controls/Carousel/Carousel.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/CheckBox/CheckBox.cs b/src/AtomUI.Desktop.Controls/CheckBox/CheckBox.cs index e04de6390..9883be6bc 100644 --- a/src/AtomUI.Desktop.Controls/CheckBox/CheckBox.cs +++ b/src/AtomUI.Desktop.Controls/CheckBox/CheckBox.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Chrome/TitleBar.cs b/src/AtomUI.Desktop.Controls/Chrome/TitleBar.cs index 7eef1f062..4cae6e8ef 100644 --- a/src/AtomUI.Desktop.Controls/Chrome/TitleBar.cs +++ b/src/AtomUI.Desktop.Controls/Chrome/TitleBar.cs @@ -126,8 +126,7 @@ internal class TitleBar : TemplatedControl, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ChromeToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Collapse/Collapse.cs b/src/AtomUI.Desktop.Controls/Collapse/Collapse.cs index 625828198..e5acf35ad 100644 --- a/src/AtomUI.Desktop.Controls/Collapse/Collapse.cs +++ b/src/AtomUI.Desktop.Controls/Collapse/Collapse.cs @@ -139,8 +139,7 @@ public class Collapse : SelectingItemsControl, { Orientation = Orientation.Vertical }); - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => CollapseToken.ID; diff --git a/src/AtomUI.Desktop.Controls/ComboBox/ComboBox.cs b/src/AtomUI.Desktop.Controls/ComboBox/ComboBox.cs index 56ed05136..b96e09cbc 100644 --- a/src/AtomUI.Desktop.Controls/ComboBox/ComboBox.cs +++ b/src/AtomUI.Desktop.Controls/ComboBox/ComboBox.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Dialog/ButtonBox/DialogButtonBox.cs b/src/AtomUI.Desktop.Controls/Dialog/ButtonBox/DialogButtonBox.cs index ae3813f2d..ff5fabeaf 100644 --- a/src/AtomUI.Desktop.Controls/Dialog/ButtonBox/DialogButtonBox.cs +++ b/src/AtomUI.Desktop.Controls/Dialog/ButtonBox/DialogButtonBox.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Dialog/Dialog.cs b/src/AtomUI.Desktop.Controls/Dialog/Dialog.cs index 54f3bb9bc..f887ca298 100644 --- a/src/AtomUI.Desktop.Controls/Dialog/Dialog.cs +++ b/src/AtomUI.Desktop.Controls/Dialog/Dialog.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHeader.cs b/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHeader.cs index 3e0e09d54..5febb60ff 100644 --- a/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHeader.cs +++ b/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHeader.cs @@ -110,8 +110,6 @@ internal class OverlayDialogHeader : TemplatedControl, IMotionAwareControl } #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; internal static readonly DirectProperty IsDialogMaximizedProperty = AvaloniaProperty.RegisterDirect( diff --git a/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHost.cs b/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHost.cs index 6fa9f7cf3..885777e48 100644 --- a/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHost.cs +++ b/src/AtomUI.Desktop.Controls/Dialog/OverlayHost/OverlayDialogHost.cs @@ -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 diff --git a/src/AtomUI.Desktop.Controls/Dialog/WindowHost/DialogHost.cs b/src/AtomUI.Desktop.Controls/Dialog/WindowHost/DialogHost.cs index a9b65b84b..fe16003d4 100644 --- a/src/AtomUI.Desktop.Controls/Dialog/WindowHost/DialogHost.cs +++ b/src/AtomUI.Desktop.Controls/Dialog/WindowHost/DialogHost.cs @@ -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); diff --git a/src/AtomUI.Desktop.Controls/Drawer/Drawer.cs b/src/AtomUI.Desktop.Controls/Drawer/Drawer.cs index 149c9f819..4748d8152 100644 --- a/src/AtomUI.Desktop.Controls/Drawer/Drawer.cs +++ b/src/AtomUI.Desktop.Controls/Drawer/Drawer.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Expander/Expander.cs b/src/AtomUI.Desktop.Controls/Expander/Expander.cs index b57531ad7..89fe5c689 100644 --- a/src/AtomUI.Desktop.Controls/Expander/Expander.cs +++ b/src/AtomUI.Desktop.Controls/Expander/Expander.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Flyouts/FlyoutHost.cs b/src/AtomUI.Desktop.Controls/Flyouts/FlyoutHost.cs index 76e5959f7..0efc7e475 100644 --- a/src/AtomUI.Desktop.Controls/Flyouts/FlyoutHost.cs +++ b/src/AtomUI.Desktop.Controls/Flyouts/FlyoutHost.cs @@ -168,12 +168,6 @@ public class FlyoutHost : ContentControl, IMotionAwareControl set => SetValue(CloseMotionProperty, value); } - #endregion - - #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; - #endregion private readonly FlyoutStateHelper _flyoutStateHelper; diff --git a/src/AtomUI.Desktop.Controls/Flyouts/MenuFlyoutPresenter.cs b/src/AtomUI.Desktop.Controls/Flyouts/MenuFlyoutPresenter.cs index e3ea524fb..4bdd1855e 100644 --- a/src/AtomUI.Desktop.Controls/Flyouts/MenuFlyoutPresenter.cs +++ b/src/AtomUI.Desktop.Controls/Flyouts/MenuFlyoutPresenter.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Flyouts/TreeViewFlyoutPresenter.cs b/src/AtomUI.Desktop.Controls/Flyouts/TreeViewFlyoutPresenter.cs index e6cb00dd5..1d82c4587 100644 --- a/src/AtomUI.Desktop.Controls/Flyouts/TreeViewFlyoutPresenter.cs +++ b/src/AtomUI.Desktop.Controls/Flyouts/TreeViewFlyoutPresenter.cs @@ -61,8 +61,7 @@ public class TreeViewFlyoutPresenter : FloatableTreeView, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID; diff --git a/src/AtomUI.Desktop.Controls/ImagePreviewer/AbstractImagePreviewer.cs b/src/AtomUI.Desktop.Controls/ImagePreviewer/AbstractImagePreviewer.cs index 0cf0424a3..266f8461b 100644 --- a/src/AtomUI.Desktop.Controls/ImagePreviewer/AbstractImagePreviewer.cs +++ b/src/AtomUI.Desktop.Controls/ImagePreviewer/AbstractImagePreviewer.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerCover.cs b/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerCover.cs index e15e15cab..c6e09711e 100644 --- a/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerCover.cs +++ b/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerCover.cs @@ -41,8 +41,6 @@ internal class ImagePreviewerCover : TemplatedControl, IMotionAwareControl set => SetValue(MaskOpacityProperty, value); } - Control IMotionAwareControl.PropertyBindTarget => this; - #endregion protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) diff --git a/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerDialog.cs b/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerDialog.cs index e899daff0..63b6ad00f 100644 --- a/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerDialog.cs +++ b/src/AtomUI.Desktop.Controls/ImagePreviewer/ImagePreviewerDialog.cs @@ -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); diff --git a/src/AtomUI.Desktop.Controls/ImagePreviewer/ImageViewer.cs b/src/AtomUI.Desktop.Controls/ImagePreviewer/ImageViewer.cs index 93c767943..92a2907dd 100644 --- a/src/AtomUI.Desktop.Controls/ImagePreviewer/ImageViewer.cs +++ b/src/AtomUI.Desktop.Controls/ImagePreviewer/ImageViewer.cs @@ -274,7 +274,6 @@ internal class ImageViewer : TemplatedControl, IMotionAwareControl set => SetAndRaise(IsImageFitToWindowProperty, ref _isImageFitToWindow, value); } - Control IMotionAwareControl.PropertyBindTarget => this; #endregion private ImagePreviewRenderer? _image; diff --git a/src/AtomUI.Desktop.Controls/Input/TextArea.cs b/src/AtomUI.Desktop.Controls/Input/TextArea.cs index 13ae6a918..76044b6c7 100644 --- a/src/AtomUI.Desktop.Controls/Input/TextArea.cs +++ b/src/AtomUI.Desktop.Controls/Input/TextArea.cs @@ -166,7 +166,6 @@ public class TextArea : AvaloniaTextBox, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => LineEditToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/Input/TextBox.cs b/src/AtomUI.Desktop.Controls/Input/TextBox.cs index d8589c508..e3875cc9e 100644 --- a/src/AtomUI.Desktop.Controls/Input/TextBox.cs +++ b/src/AtomUI.Desktop.Controls/Input/TextBox.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/List/List.cs b/src/AtomUI.Desktop.Controls/List/List.cs index a178083e5..6e6f72143 100644 --- a/src/AtomUI.Desktop.Controls/List/List.cs +++ b/src/AtomUI.Desktop.Controls/List/List.cs @@ -405,7 +405,6 @@ public class List : TemplatedControl, private set; } - Control IMotionAwareControl.PropertyBindTarget => this; Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ListToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Menu/ContextMenu.cs b/src/AtomUI.Desktop.Controls/Menu/ContextMenu.cs index ebed3d292..f7443dfe2 100644 --- a/src/AtomUI.Desktop.Controls/Menu/ContextMenu.cs +++ b/src/AtomUI.Desktop.Controls/Menu/ContextMenu.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Menu/Menu.cs b/src/AtomUI.Desktop.Controls/Menu/Menu.cs index 4e4a6779b..8e9139350 100644 --- a/src/AtomUI.Desktop.Controls/Menu/Menu.cs +++ b/src/AtomUI.Desktop.Controls/Menu/Menu.cs @@ -63,8 +63,7 @@ public class Menu : AvaloniaMenu, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => MenuToken.ID; #endregion diff --git a/src/AtomUI.Desktop.Controls/Message/MessageCard.cs b/src/AtomUI.Desktop.Controls/Message/MessageCard.cs index b90fa1224..e8c3c4993 100644 --- a/src/AtomUI.Desktop.Controls/Message/MessageCard.cs +++ b/src/AtomUI.Desktop.Controls/Message/MessageCard.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Message/WindowMessageManager.cs b/src/AtomUI.Desktop.Controls/Message/WindowMessageManager.cs index d74e01171..378b4cce1 100644 --- a/src/AtomUI.Desktop.Controls/Message/WindowMessageManager.cs +++ b/src/AtomUI.Desktop.Controls/Message/WindowMessageManager.cs @@ -66,8 +66,7 @@ public class WindowMessageManager : TemplatedControl, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => MessageToken.ID; diff --git a/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs b/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs index c2377b07c..88f2e5478 100644 --- a/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs +++ b/src/AtomUI.Desktop.Controls/MessageBox/MessageBox.cs @@ -232,7 +232,6 @@ public class MessageBox : TemplatedControl, #region 内部属性定义 - Control IMotionAwareControl.PropertyBindTarget => this; Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => DialogToken.ID; diff --git a/src/AtomUI.Desktop.Controls/NavMenu/NavMenu.cs b/src/AtomUI.Desktop.Controls/NavMenu/NavMenu.cs index b960b8265..655d4c721 100644 --- a/src/AtomUI.Desktop.Controls/NavMenu/NavMenu.cs +++ b/src/AtomUI.Desktop.Controls/NavMenu/NavMenu.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Notifications/NotificationCard.cs b/src/AtomUI.Desktop.Controls/Notifications/NotificationCard.cs index 1835234ed..af7172fc7 100644 --- a/src/AtomUI.Desktop.Controls/Notifications/NotificationCard.cs +++ b/src/AtomUI.Desktop.Controls/Notifications/NotificationCard.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Notifications/WindowNotificationManager.cs b/src/AtomUI.Desktop.Controls/Notifications/WindowNotificationManager.cs index 677a53d9a..f23998739 100644 --- a/src/AtomUI.Desktop.Controls/Notifications/WindowNotificationManager.cs +++ b/src/AtomUI.Desktop.Controls/Notifications/WindowNotificationManager.cs @@ -73,8 +73,7 @@ public class WindowNotificationManager : TemplatedControl, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => NotificationToken.ID; diff --git a/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs b/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs index c9f26772c..e596b7faf 100644 --- a/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs +++ b/src/AtomUI.Desktop.Controls/NumericUpDown/NumericUpDown.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/OptionButtonGroup/OptionButtonGroup.cs b/src/AtomUI.Desktop.Controls/OptionButtonGroup/OptionButtonGroup.cs index 575180fc0..3875a7bf6 100644 --- a/src/AtomUI.Desktop.Controls/OptionButtonGroup/OptionButtonGroup.cs +++ b/src/AtomUI.Desktop.Controls/OptionButtonGroup/OptionButtonGroup.cs @@ -118,8 +118,7 @@ public class OptionButtonGroup : SelectingItemsControl, { Orientation = Orientation.Horizontal }); - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => OptionButtonToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Pagination/AbstractPagination.cs b/src/AtomUI.Desktop.Controls/Pagination/AbstractPagination.cs index 714585418..58442b41d 100644 --- a/src/AtomUI.Desktop.Controls/Pagination/AbstractPagination.cs +++ b/src/AtomUI.Desktop.Controls/Pagination/AbstractPagination.cs @@ -105,8 +105,6 @@ public abstract class AbstractPagination : TemplatedControl, ISizeTypeAware, IMo return allowPageSizes.Contains(pageSize); } - Control IMotionAwareControl.PropertyBindTarget => this; - #endregion protected bool TemplateConfigured = false; diff --git a/src/AtomUI.Desktop.Controls/Popup/Popup.cs b/src/AtomUI.Desktop.Controls/Popup/Popup.cs index 78ff07c90..1947428cf 100644 --- a/src/AtomUI.Desktop.Controls/Popup/Popup.cs +++ b/src/AtomUI.Desktop.Controls/Popup/Popup.cs @@ -140,9 +140,7 @@ public class Popup : AvaloniaPopup, IMotionAwareControl get => GetValue(IsDetectMouseClickEnabledProperty); set => SetValue(IsDetectMouseClickEnabledProperty, value); } - - Control IMotionAwareControl.PropertyBindTarget => this; - + #endregion internal BaseMotionActor? MotionActor; diff --git a/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs b/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs index daa71b6a5..8263d7fd1 100644 --- a/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs +++ b/src/AtomUI.Desktop.Controls/Primitives/AddOnDecoratedBox/AddOnDecoratedBox.cs @@ -263,8 +263,6 @@ internal class AddOnDecoratedBox : ContentControl, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => AddOnDecoratedBoxToken.ID; - - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/Primitives/ArrowDecoratedBox/ArrowDecoratedBox.cs b/src/AtomUI.Desktop.Controls/Primitives/ArrowDecoratedBox/ArrowDecoratedBox.cs index ca7999df9..0e7ced4d6 100644 --- a/src/AtomUI.Desktop.Controls/Primitives/ArrowDecoratedBox/ArrowDecoratedBox.cs +++ b/src/AtomUI.Desktop.Controls/Primitives/ArrowDecoratedBox/ArrowDecoratedBox.cs @@ -170,7 +170,6 @@ public class ArrowDecoratedBox : ContentControl, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ArrowDecoratedBoxToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; private Rect _arrowIndicatorBounds; diff --git a/src/AtomUI.Desktop.Controls/Primitives/IndicatorScrollViewer/IndicatorScrollViewer.cs b/src/AtomUI.Desktop.Controls/Primitives/IndicatorScrollViewer/IndicatorScrollViewer.cs index 3584be235..0cbf09279 100644 --- a/src/AtomUI.Desktop.Controls/Primitives/IndicatorScrollViewer/IndicatorScrollViewer.cs +++ b/src/AtomUI.Desktop.Controls/Primitives/IndicatorScrollViewer/IndicatorScrollViewer.cs @@ -29,7 +29,6 @@ internal class IndicatorScrollViewer : ScrollViewer, IMotionAwareControl, IContr } #region 内部属性定义 - Control IMotionAwareControl.PropertyBindTarget => this; Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ButtonToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs b/src/AtomUI.Desktop.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs index 280352836..e6a0d5b37 100644 --- a/src/AtomUI.Desktop.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs +++ b/src/AtomUI.Desktop.Controls/Primitives/InfoPickerInput/InfoPickerInput.cs @@ -254,7 +254,6 @@ public abstract class InfoPickerInput : TemplatedControl, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => InfoPickerInputToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs b/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs index 5acebde88..91d3a7c2f 100644 --- a/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs +++ b/src/AtomUI.Desktop.Controls/Primitives/SizeTypeAwareIconPresenter/SizeTypeAwareIconPresenter.cs @@ -41,7 +41,6 @@ internal class SizeTypeAwareIconPresenter : TemplatedControl, ISizeTypeAware, IM } #endregion - Control IMotionAwareControl.PropertyBindTarget => this; static SizeTypeAwareIconPresenter() { diff --git a/src/AtomUI.Desktop.Controls/ProgressBar/AbstractProgressBar.cs b/src/AtomUI.Desktop.Controls/ProgressBar/AbstractProgressBar.cs index d82dadb68..3f99d1153 100644 --- a/src/AtomUI.Desktop.Controls/ProgressBar/AbstractProgressBar.cs +++ b/src/AtomUI.Desktop.Controls/ProgressBar/AbstractProgressBar.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/RadioButton/RadioButton.cs b/src/AtomUI.Desktop.Controls/RadioButton/RadioButton.cs index b248d38de..b40b21891 100644 --- a/src/AtomUI.Desktop.Controls/RadioButton/RadioButton.cs +++ b/src/AtomUI.Desktop.Controls/RadioButton/RadioButton.cs @@ -36,8 +36,7 @@ public class RadioButton : AvaloniaRadioButton, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => RadioButtonToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Rate/Rate.cs b/src/AtomUI.Desktop.Controls/Rate/Rate.cs index ab465f076..fc42d7f12 100644 --- a/src/AtomUI.Desktop.Controls/Rate/Rate.cs +++ b/src/AtomUI.Desktop.Controls/Rate/Rate.cs @@ -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 diff --git a/src/AtomUI.Desktop.Controls/Segmented/Segmented.cs b/src/AtomUI.Desktop.Controls/Segmented/Segmented.cs index 7b4f1723c..5349eae04 100644 --- a/src/AtomUI.Desktop.Controls/Segmented/Segmented.cs +++ b/src/AtomUI.Desktop.Controls/Segmented/Segmented.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Select/Select.cs b/src/AtomUI.Desktop.Controls/Select/Select.cs index cf75b0f59..3b35d791c 100644 --- a/src/AtomUI.Desktop.Controls/Select/Select.cs +++ b/src/AtomUI.Desktop.Controls/Select/Select.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Slider/Slider.cs b/src/AtomUI.Desktop.Controls/Slider/Slider.cs index e4ba7c852..168621040 100644 --- a/src/AtomUI.Desktop.Controls/Slider/Slider.cs +++ b/src/AtomUI.Desktop.Controls/Slider/Slider.cs @@ -197,8 +197,7 @@ public class Slider : RangeBase, #endregion #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; + Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => SliderToken.ID; diff --git a/src/AtomUI.Desktop.Controls/Spin/Spin.cs b/src/AtomUI.Desktop.Controls/Spin/Spin.cs index 04162936d..ef32ff8a0 100644 --- a/src/AtomUI.Desktop.Controls/Spin/Spin.cs +++ b/src/AtomUI.Desktop.Controls/Spin/Spin.cs @@ -140,7 +140,6 @@ public class Spin : ContentControl, IMotionAwareControl set => SetValue(MaskOpacityProperty, value); } - Control IMotionAwareControl.PropertyBindTarget => this; #endregion protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) diff --git a/src/AtomUI.Desktop.Controls/Steps/Steps.cs b/src/AtomUI.Desktop.Controls/Steps/Steps.cs index 71eb3fdf3..83bad5872 100644 --- a/src/AtomUI.Desktop.Controls/Steps/Steps.cs +++ b/src/AtomUI.Desktop.Controls/Steps/Steps.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Switch/ToggleSwitch.cs b/src/AtomUI.Desktop.Controls/Switch/ToggleSwitch.cs index 26f50130c..717d0d779 100644 --- a/src/AtomUI.Desktop.Controls/Switch/ToggleSwitch.cs +++ b/src/AtomUI.Desktop.Controls/Switch/ToggleSwitch.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/TabControl/BaseTabControl.cs b/src/AtomUI.Desktop.Controls/TabControl/BaseTabControl.cs index 0091c4801..d56ef836e 100644 --- a/src/AtomUI.Desktop.Controls/TabControl/BaseTabControl.cs +++ b/src/AtomUI.Desktop.Controls/TabControl/BaseTabControl.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/TabControl/TabStrip/BaseTabStrip.cs b/src/AtomUI.Desktop.Controls/TabControl/TabStrip/BaseTabStrip.cs index 830e2d37c..169b08adb 100644 --- a/src/AtomUI.Desktop.Controls/TabControl/TabStrip/BaseTabStrip.cs +++ b/src/AtomUI.Desktop.Controls/TabControl/TabStrip/BaseTabStrip.cs @@ -177,7 +177,6 @@ public abstract class BaseTabStrip : AvaloniaTabStrip, private protected readonly Dictionary ItemsBindingDisposables = new(); - Control IMotionAwareControl.PropertyBindTarget => this; Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => TabControlToken.ID; diff --git a/src/AtomUI.Desktop.Controls/TextBlock/HyperLinkTextBlock.cs b/src/AtomUI.Desktop.Controls/TextBlock/HyperLinkTextBlock.cs index b6b21b674..120e66d9b 100644 --- a/src/AtomUI.Desktop.Controls/TextBlock/HyperLinkTextBlock.cs +++ b/src/AtomUI.Desktop.Controls/TextBlock/HyperLinkTextBlock.cs @@ -155,8 +155,6 @@ public class HyperLinkTextBlock : TemplatedControl, IMotionAwareControl set => SetValue(ClickModeProperty, value); } - Control IMotionAwareControl.PropertyBindTarget => this; - #endregion private bool _commandCanExecute = true; diff --git a/src/AtomUI.Desktop.Controls/Tooltip/ToolTip.cs b/src/AtomUI.Desktop.Controls/Tooltip/ToolTip.cs index 42d7a9474..f59dbed44 100644 --- a/src/AtomUI.Desktop.Controls/Tooltip/ToolTip.cs +++ b/src/AtomUI.Desktop.Controls/Tooltip/ToolTip.cs @@ -318,7 +318,6 @@ public class ToolTip : ContentControl, Control IControlSharedTokenResourcesHost.HostControl => this; string IControlSharedTokenResourcesHost.TokenId => ToolTipToken.ID; - Control IMotionAwareControl.PropertyBindTarget => this; #endregion diff --git a/src/AtomUI.Desktop.Controls/TreeView/TreeView.cs b/src/AtomUI.Desktop.Controls/TreeView/TreeView.cs index 93573cb4c..af1c78ebe 100644 --- a/src/AtomUI.Desktop.Controls/TreeView/TreeView.cs +++ b/src/AtomUI.Desktop.Controls/TreeView/TreeView.cs @@ -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; diff --git a/src/AtomUI.Desktop.Controls/Upload/UploadList.cs b/src/AtomUI.Desktop.Controls/Upload/UploadList.cs index e162d0e91..34a692ff5 100644 --- a/src/AtomUI.Desktop.Controls/Upload/UploadList.cs +++ b/src/AtomUI.Desktop.Controls/Upload/UploadList.cs @@ -28,12 +28,6 @@ internal class UploadList : ItemsControl, IMotionAwareControl set => SetValue(IsMotionEnabledProperty, value); } - #endregion - - #region 内部属性定义 - - Control IMotionAwareControl.PropertyBindTarget => this; - #endregion private readonly Dictionary _itemsBindingDisposables = new();