From f03c0749fd5dca55761b64ee1233ea1238be6e74 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 11 Dec 2022 00:33:50 +0800 Subject: [PATCH 1/2] feat: add label as tag theme. --- src/Semi.Avalonia/Controls/Label.axaml | 321 +++++++++++++++++++++ src/Semi.Avalonia/Themes/Light/Label.axaml | 109 +++++++ src/Semi.Avalonia/Themes/Light/Light.axaml | 1 + 3 files changed, 431 insertions(+) create mode 100644 src/Semi.Avalonia/Themes/Light/Label.axaml diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml index c70f024..cc3e0aa 100644 --- a/src/Semi.Avalonia/Controls/Label.axaml +++ b/src/Semi.Avalonia/Controls/Label.axaml @@ -1,4 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78,4 +153,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml new file mode 100644 index 0000000..97d63ed --- /dev/null +++ b/src/Semi.Avalonia/Themes/Light/Label.axaml @@ -0,0 +1,109 @@ + + + + 1 + 8 2 + 8 4 + 20 + 24 + 12 + 3 + 9999 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml index 970f3b5..478588e 100644 --- a/src/Semi.Avalonia/Themes/Light/Light.axaml +++ b/src/Semi.Avalonia/Themes/Light/Light.axaml @@ -4,6 +4,7 @@ + From 9e2f8cd45a660fdddece8ce278b7bbeca8208b58 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 11 Dec 2022 00:37:38 +0800 Subject: [PATCH 2/2] feat: add label as tag to demo project. --- src/Semi.Avalonia.Demo/MainWindow.axaml | 3 + src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml | 78 +++++++++++++++++++ .../Pages/LabelDemo.axaml.cs | 18 +++++ src/Semi.Avalonia/Themes/Light/Label.axaml | 4 +- 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml create mode 100644 src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs diff --git a/src/Semi.Avalonia.Demo/MainWindow.axaml b/src/Semi.Avalonia.Demo/MainWindow.axaml index cc96feb..44476e5 100644 --- a/src/Semi.Avalonia.Demo/MainWindow.axaml +++ b/src/Semi.Avalonia.Demo/MainWindow.axaml @@ -17,5 +17,8 @@ + + + diff --git a/src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml b/src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml new file mode 100644 index 0000000..d55be47 --- /dev/null +++ b/src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs b/src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs new file mode 100644 index 0000000..2d708e4 --- /dev/null +++ b/src/Semi.Avalonia.Demo/Pages/LabelDemo.axaml.cs @@ -0,0 +1,18 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Semi.Avalonia.Demo.Pages; + +public partial class LabelDemo : UserControl +{ + public LabelDemo() + { + InitializeComponent(); + } + + private void InitializeComponent() + { + AvaloniaXamlLoader.Load(this); + } +} \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml index 97d63ed..4ad4f42 100644 --- a/src/Semi.Avalonia/Themes/Light/Label.axaml +++ b/src/Semi.Avalonia/Themes/Light/Label.axaml @@ -42,8 +42,8 @@ - - + +