diff --git a/src/AtomUI.Desktop.Controls/Skeleton/Skeleton.cs b/src/AtomUI.Desktop.Controls/Skeleton/Skeleton.cs index 06e99bda0..48f832c95 100644 --- a/src/AtomUI.Desktop.Controls/Skeleton/Skeleton.cs +++ b/src/AtomUI.Desktop.Controls/Skeleton/Skeleton.cs @@ -1,6 +1,5 @@ using System.Diagnostics; using AtomUI.Controls; -using AtomUI.Desktop.Controls.Themes; using AtomUI.Theme; using Avalonia; using Avalonia.Controls; @@ -194,10 +193,10 @@ public class Skeleton : AbstractSkeleton protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { base.OnApplyTemplate(e); - _avatar = e.NameScope.Find(SkeletonThemeConstants.AvatarPart); - _title = e.NameScope.Find(SkeletonThemeConstants.TitlePart); - _paragraph = e.NameScope.Find(SkeletonThemeConstants.ParagraphPart); - + _avatar = e.NameScope.Find("PART_Avatar"); + _title = e.NameScope.Find("PART_Title"); + _paragraph = e.NameScope.Find("PART_Paragraph"); + Debug.Assert(_avatar != null); Debug.Assert(_title != null); Debug.Assert(_paragraph != null); diff --git a/src/AtomUI.Desktop.Controls/Skeleton/SkeletonLine.cs b/src/AtomUI.Desktop.Controls/Skeleton/SkeletonLine.cs index ede8c85f5..c8fafc6a1 100644 --- a/src/AtomUI.Desktop.Controls/Skeleton/SkeletonLine.cs +++ b/src/AtomUI.Desktop.Controls/Skeleton/SkeletonLine.cs @@ -1,4 +1,3 @@ -using AtomUI.Desktop.Controls.Themes; using Avalonia; using Avalonia.Controls; using Avalonia.Controls.Primitives; @@ -64,7 +63,7 @@ public class SkeletonLine : AbstractSkeleton protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { base.OnApplyTemplate(e); - _rootLayout = e.NameScope.Find(AbstractSkeletonThemeConstants.RootLayoutPart); + _rootLayout = e.NameScope.Find("PART_RootLayout"); if (!IsFollowMode) { if (IsActive) diff --git a/src/AtomUI.Desktop.Controls/Skeleton/SkeletonParagraph.cs b/src/AtomUI.Desktop.Controls/Skeleton/SkeletonParagraph.cs index c3e4a3a21..80261160c 100644 --- a/src/AtomUI.Desktop.Controls/Skeleton/SkeletonParagraph.cs +++ b/src/AtomUI.Desktop.Controls/Skeleton/SkeletonParagraph.cs @@ -1,4 +1,3 @@ -using AtomUI.Desktop.Controls.Themes; using AtomUI.Theme; using Avalonia; using Avalonia.Controls; @@ -79,7 +78,7 @@ public class SkeletonParagraph : AbstractSkeleton protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { base.OnApplyTemplate(e); - _linesLayout = e.NameScope.Find(SkeletonParagraphThemeConstants.LineLayoutPart); + _linesLayout = e.NameScope.Find("PART_LineLayout"); BuildLines(); if (!IsFollowMode) { diff --git a/src/AtomUI.Desktop.Controls/Skeleton/Themes/AbstractSkeletonTheme.axaml b/src/AtomUI.Desktop.Controls/Skeleton/Themes/AbstractSkeletonTheme.axaml index 6b8eb8d03..00570c294 100644 --- a/src/AtomUI.Desktop.Controls/Skeleton/Themes/AbstractSkeletonTheme.axaml +++ b/src/AtomUI.Desktop.Controls/Skeleton/Themes/AbstractSkeletonTheme.axaml @@ -8,12 +8,12 @@ - - + - diff --git a/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonImageTheme.axaml b/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonImageTheme.axaml index df22e2474..965e39a25 100644 --- a/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonImageTheme.axaml +++ b/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonImageTheme.axaml @@ -14,12 +14,12 @@ - - + - - - + - - + diff --git a/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonTheme.axaml b/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonTheme.axaml index 033cdac84..da2cb6490 100644 --- a/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonTheme.axaml +++ b/src/AtomUI.Desktop.Controls/Skeleton/Themes/SkeletonTheme.axaml @@ -13,20 +13,20 @@ - - + -