From 06e64f70bcb0cc3b9d9f8f58b21621ec53baec00 Mon Sep 17 00:00:00 2001 From: chinboy Date: Wed, 5 Mar 2025 15:06:11 +0800 Subject: [PATCH] Refactor Collapse --- src/AtomUI.Controls/CheckBox/CheckBox.cs | 1 - src/AtomUI.Controls/Collapse/CollapseItemTheme.cs | 1 - src/AtomUI.Controls/Collapse/CollapseTheme.cs | 12 ++++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/AtomUI.Controls/CheckBox/CheckBox.cs b/src/AtomUI.Controls/CheckBox/CheckBox.cs index dc6ff047d..1b73beb91 100644 --- a/src/AtomUI.Controls/CheckBox/CheckBox.cs +++ b/src/AtomUI.Controls/CheckBox/CheckBox.cs @@ -1,4 +1,3 @@ -using System.Reactive.Disposables; using AtomUI.Theme; using AtomUI.Theme.Utils; using Avalonia; diff --git a/src/AtomUI.Controls/Collapse/CollapseItemTheme.cs b/src/AtomUI.Controls/Collapse/CollapseItemTheme.cs index e33bf391f..831dc7dde 100644 --- a/src/AtomUI.Controls/Collapse/CollapseItemTheme.cs +++ b/src/AtomUI.Controls/Collapse/CollapseItemTheme.cs @@ -1,7 +1,6 @@ using AtomUI.IconPkg; using AtomUI.MotionScene; using AtomUI.Theme; -using AtomUI.Theme.Data; using AtomUI.Theme.Styling; using AtomUI.Utils; using Avalonia; diff --git a/src/AtomUI.Controls/Collapse/CollapseTheme.cs b/src/AtomUI.Controls/Collapse/CollapseTheme.cs index db0ea7837..09aae3d91 100644 --- a/src/AtomUI.Controls/Collapse/CollapseTheme.cs +++ b/src/AtomUI.Controls/Collapse/CollapseTheme.cs @@ -22,7 +22,7 @@ internal class CollapseTheme : BaseControlTheme { return new FuncControlTemplate((collapse, scope) => { - var Frame = new Border + var frame = new Border { Name = FramePart, ClipToBounds = true @@ -32,18 +32,18 @@ internal class CollapseTheme : BaseControlTheme Name = ItemsPresenterPart }; itemsPresenter.RegisterInNameScope(scope); - Frame.Child = itemsPresenter; + frame.Child = itemsPresenter; CreateTemplateParentBinding(itemsPresenter, ItemsPresenter.ItemsPanelProperty, ItemsControl.ItemsPanelProperty); - CreateTemplateParentBinding(Frame, Border.BorderThicknessProperty, + CreateTemplateParentBinding(frame, Border.BorderThicknessProperty, Collapse.EffectiveBorderThicknessProperty); - CreateTemplateParentBinding(Frame, Border.BorderBrushProperty, + CreateTemplateParentBinding(frame, Border.BorderBrushProperty, TemplatedControl.BorderBrushProperty); - CreateTemplateParentBinding(Frame, Border.CornerRadiusProperty, + CreateTemplateParentBinding(frame, Border.CornerRadiusProperty, TemplatedControl.CornerRadiusProperty); - return Frame; + return frame; }); }