From 40fc7a04b1246ffa2e8b1a566550c7f4741fd91e Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 27 Jul 2023 23:48:58 +0800 Subject: [PATCH] feat: add Themes. --- demo/Ursa.Demo/Pages/DualBadgeDemo.axaml | 71 ++++++++++++++++++- src/Ursa.Themes.Semi/Controls/DualBadge.axaml | 24 +++++++ .../Themes/Dark/DualBadge.axaml | 9 ++- .../Themes/Light/DualBadge.axaml | 11 ++- src/Ursa/Controls/DualBadge.cs | 5 +- 5 files changed, 111 insertions(+), 9 deletions(-) diff --git a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml index fbb4738..c3fb94d 100644 --- a/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml +++ b/demo/Ursa.Demo/Pages/DualBadgeDemo.axaml @@ -12,7 +12,7 @@ 2.4k - + 2.4k - + 2.4k - + @@ -39,5 +39,70 @@ 2.4k + + + + 2.4K + + + + + + + 2.4K + + + + 2.4K + + + + + + + 2.4K + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml index a8b10ba..4cfb62f 100644 --- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml +++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml @@ -63,4 +63,28 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml index f1f8875..9bf6a64 100644 --- a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml +++ b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml @@ -3,5 +3,12 @@ White #FF888D92 White - #FF5DC264 + + + + + + + + \ No newline at end of file diff --git a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml index a8ee239..6249aa8 100644 --- a/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml +++ b/src/Ursa.Themes.Semi/Themes/Light/DualBadge.axaml @@ -1,7 +1,14 @@  White White - #FF6B7075 + + + + White - #FF3BB346 + + + + + \ No newline at end of file diff --git a/src/Ursa/Controls/DualBadge.cs b/src/Ursa/Controls/DualBadge.cs index de6df7c..7ffd789 100644 --- a/src/Ursa/Controls/DualBadge.cs +++ b/src/Ursa/Controls/DualBadge.cs @@ -4,7 +4,6 @@ using Avalonia.Controls.Metadata; using Avalonia.Controls.Presenters; using Avalonia.Controls.Primitives; using Avalonia.Controls.Templates; -using Avalonia.Interactivity; using Avalonia.Media; namespace Ursa.Controls; @@ -72,9 +71,9 @@ public class DualBadge : HeaderedContentControl ContentProperty.Changed.AddClassHandler((o, args) => o.OnContentChanged()); } - protected override void OnLoaded(RoutedEventArgs e) + protected override void OnApplyTemplate(TemplateAppliedEventArgs e) { - base.OnLoaded(e); + base.OnApplyTemplate(e); OnIconChanged(); OnHeaderChanged(); OnContentChanged();