From a7726f4f58dae9bf02346b30b52969241f21cc93 Mon Sep 17 00:00:00 2001 From: polarboy Date: Mon, 22 Jul 2024 00:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20ArrowDecoratedBox=20?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E5=8C=96=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrowDecoratedBox/ArrowDecoratedBox.cs | 110 +++++------------- .../ArrowDecoratedBoxToken.cs | 7 ++ src/AtomUI.Controls/Flyouts/Flyout.cs | 2 +- .../Flyouts/FlyoutPresenter.cs | 4 +- .../Flyouts/FlyoutPresenterTheme.cs | 20 ++++ src/AtomUI.Controls/Flyouts/InfoFlyout.cs | 11 -- .../TokenResourceConst.g.cs | 1 + src/AtomUI/Styling/StyleExtensions.cs | 1 + 8 files changed, 61 insertions(+), 95 deletions(-) create mode 100644 src/AtomUI.Controls/Flyouts/FlyoutPresenterTheme.cs delete mode 100644 src/AtomUI.Controls/Flyouts/InfoFlyout.cs diff --git a/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs b/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs index a15e57c..6128e65 100644 --- a/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs +++ b/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs @@ -94,6 +94,8 @@ public class ArrowDecoratedBox : TemplatedControl, public static readonly StyledProperty ChildProperty = Border.ChildProperty.AddOwner(); + internal static readonly StyledProperty ArrowSizeProperty + = AvaloniaProperty.Register(nameof(ArrowSize)); // 指针最顶点位置 // 相对坐标 @@ -117,6 +119,15 @@ public class ArrowDecoratedBox : TemplatedControl, get => GetValue(ArrowPositionProperty); set => SetValue(ArrowPositionProperty, value); } + + /// + /// 箭头的大小 + /// + internal double ArrowSize + { + get => GetValue(ArrowSizeProperty); + set => SetValue(ArrowSizeProperty, value); + } /// /// Gets or sets the decorated control. @@ -133,8 +144,6 @@ public class ArrowDecoratedBox : TemplatedControl, private Geometry? _arrowGeometry; private Rect _contentRect; private Rect _arrowRect; - private Border? _container; - private CompositeDisposable? _compositeDisposable; private bool _needGenerateArrowVertexPoint = true; static ArrowDecoratedBox() @@ -171,27 +180,6 @@ public class ArrowDecoratedBox : TemplatedControl, }; } - protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) - { - base.OnAttachedToLogicalTree(e); - if (!_initialized) { - _customStyle.SetupUI(); - SetupRelayProperties(); - } - } - - protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) - { - base.OnAttachedToVisualTree(e); - SetupRelayProperties(); - } - - protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) - { - base.OnDetachedFromVisualTree(e); - _compositeDisposable?.Dispose(); - } - protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e) { base.OnPropertyChanged(e); @@ -208,54 +196,20 @@ public class ArrowDecoratedBox : TemplatedControl, return GetContentRect(DesiredSize).Deflate(0.5); } - #region IControlCustomStyle 实现 - - // 组件的 Token 绑定属性 - private double _arrowSize; - - private static readonly DirectProperty ArrowSizeTokenProperty - = AvaloniaProperty.RegisterDirect(nameof(_arrowSize), - (o) => o._arrowSize, - (o, v) => o._arrowSize = v); - // 组件的 Token 绑定属性 - - void IControlCustomStyle.SetupUI() + protected override void OnApplyTemplate(TemplateAppliedEventArgs e) + { + base.OnApplyTemplate(e); + _customStyle.HandleTemplateApplied(e.NameScope); + } + + void IControlCustomStyle.HandleTemplateApplied(INameScope scope) { - _container = new Border(); - _customStyle.SetupTokenBindings(); if (IsShowArrow) { BuildGeometry(true); } - - LogicalChildren.Add(_container); - VisualChildren.Add(_container); - - BindUtils.CreateTokenBinding(this, BackgroundProperty, GlobalResourceKey.ColorBgContainer); - _initialized = true; - } - - private void SetupRelayProperties() - { - _compositeDisposable = new CompositeDisposable(); - // 生命周期一样，可以不用管理 - if (_container is not null) { - if (Child?.Parent is not null) { - UIStructureUtils.ClearLogicalParentRecursive(Child, null); - UIStructureUtils.ClearVisualParentRecursive(Child, null); - } - - _compositeDisposable.Add(BindUtils.RelayBind(this, BackgroundSizingProperty, _container)); - _compositeDisposable.Add(BindUtils.RelayBind(this, BackgroundProperty, _container)); - _compositeDisposable.Add(BindUtils.RelayBind(this, CornerRadiusProperty, _container)); - _compositeDisposable.Add(BindUtils.RelayBind(this, ChildProperty, _container)); - _compositeDisposable.Add(BindUtils.RelayBind(this, PaddingProperty, _container)); - } - } - - void IControlCustomStyle.SetupTokenBindings() - { - NotifySetupTokenBindings(); } + + #region IControlCustomStyle 实现 private (double, double) GetArrowVertexPoint() { @@ -272,7 +226,7 @@ public class ArrowDecoratedBox : TemplatedControl, { if (e.Property == IsShowArrowProperty || e.Property == ArrowPositionProperty || - e.Property == ArrowSizeTokenProperty || + e.Property == ArrowSizeProperty || e.Property == VisualParentProperty) { if (e.Property == IsShowArrowProperty && VisualRoot is null) { // 当开启的时候，但是还没有加入的渲染树，这个时候我们取不到 Token 需要在取值的时候重新生成一下 @@ -289,40 +243,32 @@ public class ArrowDecoratedBox : TemplatedControl, private void BuildGeometry(bool force = false) { if (_arrowGeometry is null || force) { - _arrowGeometry = CommonShapeBuilder.BuildArrow(_arrowSize, 1.5); + _arrowGeometry = CommonShapeBuilder.BuildArrow(ArrowSize, 1.5); } } - protected virtual void NotifySetupTokenBindings() - { - BindUtils.CreateTokenBinding(this, MinHeightProperty, GlobalResourceKey.ControlHeight); - BindUtils.CreateTokenBinding(this, PaddingProperty, GlobalResourceKey.PaddingXS); - BindUtils.CreateTokenBinding(this, ArrowSizeTokenProperty, ArrowDecoratedBoxResourceKey.ArrowSize); - BindUtils.CreateTokenBinding(this, CornerRadiusProperty, GlobalResourceKey.BorderRadius); - } - public sealed override void Render(DrawingContext context) { if (IsShowArrow) { var direction = GetDirection(ArrowPosition); - var matrix = Matrix.CreateTranslation(-_arrowSize / 2, -_arrowSize / 2); + var matrix = Matrix.CreateTranslation(-ArrowSize / 2, -ArrowSize / 2); if (direction == Direction.Right) { matrix *= Matrix.CreateRotation(MathUtils.Deg2Rad(90)); - matrix *= Matrix.CreateTranslation(_arrowSize / 2, _arrowSize / 2); + matrix *= Matrix.CreateTranslation(ArrowSize / 2, ArrowSize / 2); } else if (direction == Direction.Top) { - matrix *= Matrix.CreateTranslation(_arrowSize / 2, 0); + matrix *= Matrix.CreateTranslation(ArrowSize / 2, 0); } else if (direction == Direction.Left) { matrix *= Matrix.CreateRotation(MathUtils.Deg2Rad(-90)); - matrix *= Matrix.CreateTranslation(0, _arrowSize / 2); + matrix *= Matrix.CreateTranslation(0, ArrowSize / 2); } else { matrix *= Matrix.CreateRotation(MathUtils.Deg2Rad(180)); - matrix *= Matrix.CreateTranslation(_arrowSize / 2, _arrowSize / 2); + matrix *= Matrix.CreateTranslation(ArrowSize / 2, ArrowSize / 2); } matrix *= Matrix.CreateTranslation(_arrowRect.X, _arrowRect.Y); _arrowGeometry!.Transform = new MatrixTransform(matrix); - context.DrawGeometry(_container?.Background, null, _arrowGeometry); + context.DrawGeometry(Background, null, _arrowGeometry); } } diff --git a/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBoxToken.cs b/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBoxToken.cs index 16215cc..200c0fb 100644 --- a/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBoxToken.cs +++ b/src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBoxToken.cs @@ -1,4 +1,5 @@ using AtomUI.TokenSystem; +using Avalonia; namespace AtomUI.Controls; @@ -12,6 +13,11 @@ public class ArrowDecoratedBoxToken : AbstractControlDesignToken /// public double ArrowSize { get; set; } + /// + /// 默认的内边距 + /// + public Thickness Padding { get; set; } + public ArrowDecoratedBoxToken() : base(ID) { @@ -21,5 +27,6 @@ public class ArrowDecoratedBoxToken : AbstractControlDesignToken { base.CalculateFromAlias(); ArrowSize = _globalToken.SeedToken.SizePopupArrow / 1.3; + Padding = new Thickness(_globalToken.PaddingXS); } } \ No newline at end of file diff --git a/src/AtomUI.Controls/Flyouts/Flyout.cs b/src/AtomUI.Controls/Flyouts/Flyout.cs index fc576d6..112aede 100644 --- a/src/AtomUI.Controls/Flyouts/Flyout.cs +++ b/src/AtomUI.Controls/Flyouts/Flyout.cs @@ -158,7 +158,7 @@ public class Flyout : PopupFlyoutBase { var presenter = new FlyoutPresenter { - [!Border.ChildProperty] = this[!ContentProperty] + [!FlyoutPresenter.ChildProperty] = this[!ContentProperty] }; BindUtils.RelayBind(this, IsShowArrowEffectiveProperty, presenter, IsShowArrowProperty); SetupArrowPosition(AtomPopup, presenter); diff --git a/src/AtomUI.Controls/Flyouts/FlyoutPresenter.cs b/src/AtomUI.Controls/Flyouts/FlyoutPresenter.cs index 8cbf960..015d20a 100644 --- a/src/AtomUI.Controls/Flyouts/FlyoutPresenter.cs +++ b/src/AtomUI.Controls/Flyouts/FlyoutPresenter.cs @@ -4,7 +4,9 @@ using Avalonia.LogicalTree; namespace AtomUI.Controls; public class FlyoutPresenter : ArrowDecoratedBox -{ +{ + // 我们在这里并没有增加任何元素或者样式 + protected override Type StyleKeyOverride => typeof(ArrowDecoratedBox); protected override void OnKeyDown(KeyEventArgs e) { if (e.Key == Key.Escape) diff --git a/src/AtomUI.Controls/Flyouts/FlyoutPresenterTheme.cs b/src/AtomUI.Controls/Flyouts/FlyoutPresenterTheme.cs new file mode 100644 index 0000000..008b062 --- /dev/null +++ b/src/AtomUI.Controls/Flyouts/FlyoutPresenterTheme.cs @@ -0,0 +1,20 @@ +using AtomUI.Styling; +using Avalonia.Controls; +using Avalonia.Controls.Templates; + +namespace AtomUI.Controls; + +[ControlThemeProvider] +public class FlyoutPresenterTheme : ControlTheme +{ + public FlyoutPresenterTheme() : base(typeof(FlyoutPresenter)) {} + + protected override IControlTemplate? BuildControlTemplate() + { + return new FuncControlTemplate(((presenter, scope) => + { + Console.WriteLine("xxxxxxxxxxxxxx"); + return new Panel(); + })); + } +} \ No newline at end of file diff --git a/src/AtomUI.Controls/Flyouts/InfoFlyout.cs b/src/AtomUI.Controls/Flyouts/InfoFlyout.cs deleted file mode 100644 index 084fb4e..0000000 --- a/src/AtomUI.Controls/Flyouts/InfoFlyout.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Avalonia.Controls; - -namespace AtomUI.Controls; - -public class InfoFlyout : PopupFlyoutBase -{ - protected override Control CreatePresenter() - { - return default!; - } -} \ No newline at end of file diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs index 317f8ee..0e9a53e 100644 --- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs +++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs @@ -18,6 +18,7 @@ namespace AtomUI.Styling public static class ArrowDecoratedBoxResourceKey { public static readonly TokenResourceKey ArrowSize = new TokenResourceKey("ArrowDecoratedBox.ArrowSize"); + public static readonly TokenResourceKey Padding = new TokenResourceKey("ArrowDecoratedBox.Padding"); } public static class BadgeResourceKey diff --git a/src/AtomUI/Styling/StyleExtensions.cs b/src/AtomUI/Styling/StyleExtensions.cs index 072910d..55ec72f 100644 --- a/src/AtomUI/Styling/StyleExtensions.cs +++ b/src/AtomUI/Styling/StyleExtensions.cs @@ -1,5 +1,6 @@ using AtomUI.TokenSystem; using Avalonia; +using Avalonia.Data; using Avalonia.Markup.Xaml.MarkupExtensions; using Avalonia.Styling;