From 482a4bbf4f876ea016ae4cc1c6ed8d4580ef5da2 Mon Sep 17 00:00:00 2001 From: CHINBOY Date: Tue, 10 Jun 2025 12:08:12 +0800 Subject: [PATCH] Refactor CheckBox use xaml theme --- .../AtomUIOSSControlThemesProvider.axaml | 1 + src/AtomUI.Controls/Buttons/SplitButton.cs | 2 +- src/AtomUI.Controls/CheckBox/CheckBox.cs | 2 +- .../CheckBox/CheckBoxIndicator.cs | 2 +- src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs | 191 ------------------ .../CheckBox/CheckBoxThemeConstants.cs | 8 + .../CheckBox/Themes/CheckBoxTheme.axaml | 110 ++++++++++ .../ControlThemePool.g.cs | 1 - .../OptionButtonBox/OptionButton.cs | 2 +- .../OptionButtonBox/OptionButtonGroup.cs | 2 +- .../Pagination/AbstractPagination.cs | 2 +- .../RadioButton/RadioButton.cs | 2 +- .../RadioButton/RadioIndicator.cs | 2 +- .../RadioButton/Themes/RadioButtonTheme.axaml | 9 + src/AtomUI.Controls/Slider/Slider.cs | 2 +- src/AtomUI.Controls/Switch/ToggleSwitch.cs | 2 +- .../TextBlock/HyperLinkTextBlock.cs | 2 +- src/AtomUI.Controls/Tooltip/ToolTip.cs | 2 +- .../Utils/WaveSpiritAwareControlExtensions.cs | 4 +- 19 files changed, 142 insertions(+), 206 deletions(-) delete mode 100644 src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs create mode 100644 src/AtomUI.Controls/CheckBox/CheckBoxThemeConstants.cs create mode 100644 src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml create mode 100644 src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml diff --git a/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml b/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml index c0d1911e1..66a93f04f 100644 --- a/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml +++ b/src/AtomUI.Controls/AtomUIOSSControlThemesProvider.axaml @@ -5,6 +5,7 @@ Id="AtomUI.Controls"> + diff --git a/src/AtomUI.Controls/Buttons/SplitButton.cs b/src/AtomUI.Controls/Buttons/SplitButton.cs index 3fdd07a2c..8c96a9fa0 100644 --- a/src/AtomUI.Controls/Buttons/SplitButton.cs +++ b/src/AtomUI.Controls/Buttons/SplitButton.cs @@ -101,7 +101,7 @@ public class SplitButton : ContentControl, AvaloniaProperty.Register(nameof(IsPrimaryButtonType)); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/CheckBox/CheckBox.cs b/src/AtomUI.Controls/CheckBox/CheckBox.cs index 352312f42..d9ec2e966 100644 --- a/src/AtomUI.Controls/CheckBox/CheckBox.cs +++ b/src/AtomUI.Controls/CheckBox/CheckBox.cs @@ -16,7 +16,7 @@ public class CheckBox : AvaloniaCheckBox, #region 公共属性定义 public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs b/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs index cad51db53..d52fff126 100644 --- a/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs +++ b/src/AtomUI.Controls/CheckBox/CheckBoxIndicator.cs @@ -118,7 +118,7 @@ internal class CheckBoxIndicator : Control, #region 内部属性定义 internal static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); internal static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs b/src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs deleted file mode 100644 index 6b3b9150d..000000000 --- a/src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs +++ /dev/null @@ -1,191 +0,0 @@ -using AtomUI.Theme; -using AtomUI.Theme.Styling; -using Avalonia; -using Avalonia.Controls; -using Avalonia.Controls.Presenters; -using Avalonia.Controls.Primitives; -using Avalonia.Controls.Templates; -using Avalonia.Data; -using Avalonia.Data.Converters; -using Avalonia.Input; -using Avalonia.Layout; -using Avalonia.Styling; - -namespace AtomUI.Controls; - -[ControlThemeProvider] -internal class CheckBoxTheme : BaseControlTheme -{ - internal const string FramePart = "PART_Frame"; - internal const string IndicatorPart = "PART_Indicator"; - internal const string LabelTextPart = "PART_LabelText"; - - public CheckBoxTheme() - : base(typeof(CheckBox)) - { - } - - protected override IControlTemplate BuildControlTemplate() - { - return new FuncControlTemplate((checkBox, scope) => - { - var frame = new Border() - { - Name = FramePart, - Padding = new Thickness(0, 1, 0, 1) - }; - CreateTemplateParentBinding(frame, Border.BackgroundProperty, CheckBox.BackgroundProperty); - CreateTemplateParentBinding(frame, Border.BorderBrushProperty, CheckBox.BorderBrushProperty); - CreateTemplateParentBinding(frame, Border.BorderThicknessProperty, CheckBox.BorderThicknessProperty); - CreateTemplateParentBinding(frame, Border.CornerRadiusProperty, CheckBox.CornerRadiusProperty); - - var layout = new DockPanel - { - LastChildFill = true - }; - - var indicator = new CheckBoxIndicator() - { - Name = IndicatorPart - }; - - DockPanel.SetDock(indicator, Dock.Left); - CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsMotionEnabledProperty, CheckBox.IsMotionEnabledProperty); - CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsWaveSpiritEnabledProperty, CheckBox.IsWaveSpiritEnabledProperty); - CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsEnabledProperty, CheckBox.IsEnabledProperty); - CreateTemplateParentBinding(indicator, CheckBoxIndicator.IsCheckedProperty, CheckBox.IsCheckedProperty); - layout.Children.Add(indicator); - - var labelText = new TextBlock() - { - Name = LabelTextPart, - VerticalAlignment = VerticalAlignment.Center, - }; - CreateTemplateParentBinding(labelText, TextBlock.TextProperty, CheckBox.ContentProperty); - CreateTemplateParentBinding(labelText, TextBlock.FontSizeProperty, CheckBox.FontSizeProperty); - CreateTemplateParentBinding(labelText, TextBlock.IsVisibleProperty, CheckBox.ContentProperty, - BindingMode.Default, - ObjectConverters.IsNotNull); - layout.Children.Add(labelText); - frame.Child = layout; - return frame; - }); - } - - protected override void BuildStyles() - { - BuildIndicatorStyle(); - - var commonStyle = new Style(selector => selector.Nesting()); - commonStyle.Add(CheckBox.CursorProperty, new SetterValueFactory(()=> new Cursor(StandardCursorType.Hand))); - commonStyle.Add(CheckBox.HorizontalAlignmentProperty, HorizontalAlignment.Left); - - var labelTextStyle = new Style(selector => selector.Nesting().Template().Name(LabelTextPart)); - labelTextStyle.Add(ContentPresenter.MarginProperty, CheckBoxTokenKey.TextMargin); - commonStyle.Add(labelTextStyle); - - Add(commonStyle); - - var disableStyle = - new Style(selector => selector.Nesting().PropertyEquals(InputElement.IsEnabledProperty, false)); - disableStyle.Add(TemplatedControl.ForegroundProperty, SharedTokenKey.ColorTextDisabled); - Add(disableStyle); - var enabledStyle = - new Style(selector => selector.Nesting().PropertyEquals(InputElement.IsEnabledProperty, true)); - enabledStyle.Add(TemplatedControl.ForegroundProperty, SharedTokenKey.ColorText); - Add(enabledStyle); - } - - private void BuildIndicatorStyle() - { - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.SizeProperty, CheckBoxTokenKey.CheckIndicatorSize); - indicatorStyle.Add(CheckBoxIndicator.WidthProperty, CheckBoxTokenKey.CheckIndicatorSize); - indicatorStyle.Add(CheckBoxIndicator.HeightProperty, CheckBoxTokenKey.CheckIndicatorSize); - indicatorStyle.Add(CheckBoxIndicator.CornerRadiusProperty, SharedTokenKey.BorderRadiusSM); - indicatorStyle.Add(CheckBoxIndicator.TristateMarkSizeProperty, CheckBoxTokenKey.IndicatorTristateMarkSize); - indicatorStyle.Add(CheckBoxIndicator.TristateMarkBrushProperty, SharedTokenKey.ColorPrimary); - Add(indicatorStyle); - } - - var disableStyle = - new Style(selector => selector.Nesting().PropertyEquals(InputElement.IsEnabledProperty, false)); - { - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.BackgroundProperty, SharedTokenKey.ColorBgContainerDisabled); - indicatorStyle.Add(CheckBoxIndicator.BorderBrushProperty, SharedTokenKey.ColorBorder); - disableStyle.Add(indicatorStyle); - } - var checkedStyle = - new Style(selector => selector.Nesting().PropertyEquals(ToggleButton.IsCheckedProperty, true)); - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.CheckedMarkBrushProperty, SharedTokenKey.ColorTextDisabled); - checkedStyle.Add(indicatorStyle); - } - disableStyle.Add(checkedStyle); - - var indeterminateStyle = - new Style(selector => selector.Nesting().PropertyEquals(ToggleButton.IsCheckedProperty, null)); - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.TristateMarkBrushProperty, SharedTokenKey.ColorTextDisabled); - indeterminateStyle.Add(indicatorStyle); - } - disableStyle.Add(indeterminateStyle); - } - - Add(disableStyle); - - var enabledStyle = - new Style(selector => selector.Nesting().PropertyEquals(InputElement.IsEnabledProperty, true)); - - { - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.BackgroundProperty, SharedTokenKey.ColorBgContainer); - indicatorStyle.Add(CheckBoxIndicator.CheckedMarkBrushProperty, SharedTokenKey.ColorBgContainer); - indicatorStyle.Add(CheckBoxIndicator.BorderBrushProperty, SharedTokenKey.ColorBorder); - enabledStyle.Add(indicatorStyle); - } - - var checkedStyle = new Style(selector => selector.Nesting().Class(StdPseudoClass.Checked)); - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.BackgroundProperty, SharedTokenKey.ColorPrimary); - indicatorStyle.Add(CheckBoxIndicator.BorderBrushProperty, SharedTokenKey.ColorPrimary); - checkedStyle.Add(indicatorStyle); - } - - var checkedHoverStyle = new Style(selector => selector.Nesting().Class(StdPseudoClass.PointerOver)); - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.BackgroundProperty, SharedTokenKey.ColorPrimaryHover); - indicatorStyle.Add(CheckBoxIndicator.BorderBrushProperty, SharedTokenKey.ColorPrimaryHover); - checkedHoverStyle.Add(indicatorStyle); - } - checkedStyle.Add(checkedHoverStyle); - enabledStyle.Add(checkedStyle); - - var unCheckedStyle = new Style(selector => selector.Nesting().Class(StdPseudoClass.PointerOver)); - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.BorderBrushProperty, SharedTokenKey.ColorPrimaryHover); - unCheckedStyle.Add(indicatorStyle); - } - enabledStyle.Add(unCheckedStyle); - - var indeterminateStyle = new Style(selector => - selector.Nesting().Class($"{StdPseudoClass.Indeterminate} {StdPseudoClass.PointerOver}")); - { - var indicatorStyle = new Style(selector => selector.Nesting().Template().Name(IndicatorPart)); - indicatorStyle.Add(CheckBoxIndicator.BorderBrushProperty, SharedTokenKey.ColorPrimaryHover); - indeterminateStyle.Add(indicatorStyle); - } - enabledStyle.Add(indeterminateStyle); - } - Add(enabledStyle); - } -} \ No newline at end of file diff --git a/src/AtomUI.Controls/CheckBox/CheckBoxThemeConstants.cs b/src/AtomUI.Controls/CheckBox/CheckBoxThemeConstants.cs new file mode 100644 index 000000000..59c059f0c --- /dev/null +++ b/src/AtomUI.Controls/CheckBox/CheckBoxThemeConstants.cs @@ -0,0 +1,8 @@ +namespace AtomUI.Controls; + +internal static class CheckBoxThemeConstants +{ + public const string FramePart = "PART_Frame"; + public const string IndicatorPart = "PART_Indicator"; + public const string LabelTextPart = "PART_LabelText"; +} \ No newline at end of file diff --git a/src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml b/src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml new file mode 100644 index 000000000..319c53e30 --- /dev/null +++ b/src/AtomUI.Controls/CheckBox/Themes/CheckBoxTheme.axaml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs index 723809bfb..e9ffed228 100644 --- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs +++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.ControlThemePoolGenerator/ControlThemePool.g.cs @@ -32,7 +32,6 @@ namespace AtomUI.Theme themes.Add(new AtomUI.Controls.CardTabItemTheme()); themes.Add(new AtomUI.Controls.CardTabStripItemTheme()); themes.Add(new AtomUI.Controls.CardTabStripTheme()); - themes.Add(new AtomUI.Controls.CheckBoxTheme()); themes.Add(new AtomUI.Controls.CircleProgressTheme()); themes.Add(new AtomUI.Controls.CollapseItemTheme()); themes.Add(new AtomUI.Controls.CollapseTheme()); diff --git a/src/AtomUI.Controls/OptionButtonBox/OptionButton.cs b/src/AtomUI.Controls/OptionButtonBox/OptionButton.cs index 7ae503767..83cb0b7d0 100644 --- a/src/AtomUI.Controls/OptionButtonBox/OptionButton.cs +++ b/src/AtomUI.Controls/OptionButtonBox/OptionButton.cs @@ -76,7 +76,7 @@ public class OptionButton : AvaloniaRadioButton, OptionButtonPositionTrait.OnlyOne); internal static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); internal static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs b/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs index 527cc20d5..128108dea 100644 --- a/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs +++ b/src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs @@ -42,7 +42,7 @@ public class OptionButtonGroup : SelectingItemsControl, AvaloniaProperty.Register(nameof(SizeType)); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/Pagination/AbstractPagination.cs b/src/AtomUI.Controls/Pagination/AbstractPagination.cs index 9ad9d9f52..b88ecb1f8 100644 --- a/src/AtomUI.Controls/Pagination/AbstractPagination.cs +++ b/src/AtomUI.Controls/Pagination/AbstractPagination.cs @@ -43,7 +43,7 @@ public abstract class AbstractPagination : TemplatedControl, (o, v) => o.Total = v); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public PaginationAlign Align { diff --git a/src/AtomUI.Controls/RadioButton/RadioButton.cs b/src/AtomUI.Controls/RadioButton/RadioButton.cs index 5b45e9d18..d971f63ca 100644 --- a/src/AtomUI.Controls/RadioButton/RadioButton.cs +++ b/src/AtomUI.Controls/RadioButton/RadioButton.cs @@ -16,7 +16,7 @@ public class RadioButton : AvaloniaRadioButton, #region 公共属性定义 public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/RadioButton/RadioIndicator.cs b/src/AtomUI.Controls/RadioButton/RadioIndicator.cs index edc69c386..477bc11d2 100644 --- a/src/AtomUI.Controls/RadioButton/RadioIndicator.cs +++ b/src/AtomUI.Controls/RadioButton/RadioIndicator.cs @@ -119,7 +119,7 @@ internal class RadioIndicator : Control, #region 内部属性定义 internal static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); internal static readonly StyledProperty IsWaveAnimationEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml b/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml new file mode 100644 index 000000000..0aa51a88d --- /dev/null +++ b/src/AtomUI.Controls/RadioButton/Themes/RadioButtonTheme.axaml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/src/AtomUI.Controls/Slider/Slider.cs b/src/AtomUI.Controls/Slider/Slider.cs index 36918337d..b1fc4163e 100644 --- a/src/AtomUI.Controls/Slider/Slider.cs +++ b/src/AtomUI.Controls/Slider/Slider.cs @@ -134,7 +134,7 @@ public class Slider : RangeBase, SliderTrack.IncludedProperty.AddOwner(); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveAnimationEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/Switch/ToggleSwitch.cs b/src/AtomUI.Controls/Switch/ToggleSwitch.cs index 19aa70ba0..ee2c0d02b 100644 --- a/src/AtomUI.Controls/Switch/ToggleSwitch.cs +++ b/src/AtomUI.Controls/Switch/ToggleSwitch.cs @@ -59,7 +59,7 @@ public class ToggleSwitch : ToggleButton, AvaloniaProperty.Register(nameof(IsLoading)); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Controls/TextBlock/HyperLinkTextBlock.cs b/src/AtomUI.Controls/TextBlock/HyperLinkTextBlock.cs index 8c1470323..6a59fe30d 100644 --- a/src/AtomUI.Controls/TextBlock/HyperLinkTextBlock.cs +++ b/src/AtomUI.Controls/TextBlock/HyperLinkTextBlock.cs @@ -44,7 +44,7 @@ public class HyperLinkTextBlock : TemplatedControl, ICustomHitTest, IMotionAware TextBlock.TextTrimmingProperty.AddOwner(); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); /// /// Defines the property. diff --git a/src/AtomUI.Controls/Tooltip/ToolTip.cs b/src/AtomUI.Controls/Tooltip/ToolTip.cs index c399f884d..48e1e4f22 100644 --- a/src/AtomUI.Controls/Tooltip/ToolTip.cs +++ b/src/AtomUI.Controls/Tooltip/ToolTip.cs @@ -78,7 +78,7 @@ public class ToolTip : ContentControl, AvaloniaProperty.RegisterAttached("IsCustomHide"); public static readonly StyledProperty IsMotionEnabledProperty - = WaveSpiritAwareControlProperty.IsMotionEnabledProperty.AddOwner(); + = MotionAwareControlProperty.IsMotionEnabledProperty.AddOwner(); public static readonly StyledProperty IsWaveSpiritEnabledProperty = WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty.AddOwner(); diff --git a/src/AtomUI.Theme/Utils/WaveSpiritAwareControlExtensions.cs b/src/AtomUI.Theme/Utils/WaveSpiritAwareControlExtensions.cs index ef918a99b..8ee0ac656 100644 --- a/src/AtomUI.Theme/Utils/WaveSpiritAwareControlExtensions.cs +++ b/src/AtomUI.Theme/Utils/WaveSpiritAwareControlExtensions.cs @@ -22,7 +22,7 @@ public static class WaveSpiritAwareControlExtensions { var compositeDisposable = new CompositeDisposable(); compositeDisposable.Add(TokenResourceBinder.CreateTokenBinding(control, - WaveSpiritAwareControlProperty.IsMotionEnabledProperty, + MotionAwareControlProperty.IsMotionEnabledProperty, SharedTokenKey.EnableMotion)); compositeDisposable.Add(TokenResourceBinder.CreateTokenBinding(control, WaveSpiritAwareControlProperty.IsWaveSpiritEnabledProperty, @@ -49,7 +49,7 @@ public static class WaveSpiritAwareControlExtensions { if (sender is Control hostControl) { - var isMotionEnabledChanged = e.Property.Name == WaveSpiritAwareControlProperty.IsMotionEnabledPropertyName; + var isMotionEnabledChanged = e.Property.Name == MotionAwareControlProperty.IsMotionEnabledPropertyName; var isWaveSpiritEnabledChanged = e.Property.Name == WaveSpiritAwareControlProperty.IsWaveSpiritEnabledPropertyName; if (isMotionEnabledChanged || isWaveSpiritEnabledChanged)