From ed0e256756b5e9eeb5e75c3afcd392e2458ad5de Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:45:29 +0800 Subject: [PATCH] feat: adjust the rest of PathIcon. (cherry picked from commit bc050308fc33f18b1c2551c38f343f2e9378aef5) --- .../Pages/PathIconDemo.axaml | 32 +++++++++++++------ .../Controls/ButtonSpinner.axaml | 8 ++--- src/Semi.Avalonia/Controls/Calendar.axaml | 8 ++--- .../Controls/CaptionButtons.axaml | 17 ++++------ src/Semi.Avalonia/Controls/Carousel.axaml | 5 +-- src/Semi.Avalonia/Controls/CheckBox.axaml | 3 ++ src/Semi.Avalonia/Controls/DatePicker.axaml | 8 ++--- .../Controls/DropDownButton.axaml | 3 +- src/Semi.Avalonia/Controls/ListBox.axaml | 2 ++ .../Controls/ManagedFileChooser.axaml | 9 ++---- src/Semi.Avalonia/Controls/Menu.axaml | 10 +++--- .../Controls/NotificationCard.axaml | 1 + src/Semi.Avalonia/Controls/SplitButton.axaml | 5 ++- src/Semi.Avalonia/Controls/TimePicker.axaml | 7 ++-- .../Themes/Shared/CheckBox.axaml | 4 +-- .../Themes/Shared/NotificationCard.axaml | 4 +-- 16 files changed, 67 insertions(+), 59 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml index 6e0214f..e5fa352 100644 --- a/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/PathIconDemo.axaml @@ -7,16 +7,30 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - - - + + + + + + + + + + + + + + + + Foreground="{DynamicResource SemiBlue6}" + BorderBrush="{DynamicResource SemiRed6}" + Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z" /> - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml index 1b917a9..c9ab399 100644 --- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml @@ -73,8 +73,8 @@ Grid.Row="0" Theme="{StaticResource ButtonSpinnerRepeatButton}"> @@ -83,8 +83,8 @@ Grid.Row="1" Theme="{StaticResource ButtonSpinnerRepeatButton}"> diff --git a/src/Semi.Avalonia/Controls/Calendar.axaml b/src/Semi.Avalonia/Controls/Calendar.axaml index 14d3264..73e80f5 100644 --- a/src/Semi.Avalonia/Controls/Calendar.axaml +++ b/src/Semi.Avalonia/Controls/Calendar.axaml @@ -67,8 +67,8 @@ Foreground="{TemplateBinding Foreground}" Theme="{DynamicResource BorderlessButton}"> @@ -87,8 +87,8 @@ Foreground="{TemplateBinding Foreground}" Theme="{DynamicResource BorderlessButton}"> diff --git a/src/Semi.Avalonia/Controls/CaptionButtons.axaml b/src/Semi.Avalonia/Controls/CaptionButtons.axaml index 2a83b39..3389656 100644 --- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml +++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml @@ -2,8 +2,9 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - - + + + @@ -48,23 +49,20 @@ @@ -82,8 +80,7 @@ diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml index 5712073..1f17eec 100644 --- a/src/Semi.Avalonia/Controls/Carousel.axaml +++ b/src/Semi.Avalonia/Controls/Carousel.axaml @@ -128,8 +128,9 @@ diff --git a/src/Semi.Avalonia/Controls/CheckBox.axaml b/src/Semi.Avalonia/Controls/CheckBox.axaml index 527e887..4191b7a 100644 --- a/src/Semi.Avalonia/Controls/CheckBox.axaml +++ b/src/Semi.Avalonia/Controls/CheckBox.axaml @@ -47,6 +47,7 @@ UseLayoutRounding="False" /> @@ -217,6 +218,7 @@ UseLayoutRounding="False" /> @@ -368,6 +370,7 @@ UseLayoutRounding="False" /> diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml index 7010742..60f335a 100644 --- a/src/Semi.Avalonia/Controls/DatePicker.axaml +++ b/src/Semi.Avalonia/Controls/DatePicker.axaml @@ -106,7 +106,6 @@ Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - FontSize="16" Theme="{StaticResource DateTimePickerButton}"> @@ -241,11 +239,11 @@ @@ -160,8 +158,7 @@ @@ -66,8 +65,7 @@ @@ -184,8 +182,7 @@ diff --git a/src/Semi.Avalonia/Controls/NotificationCard.axaml b/src/Semi.Avalonia/Controls/NotificationCard.axaml index 2fd8b85..629f209 100644 --- a/src/Semi.Avalonia/Controls/NotificationCard.axaml +++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml @@ -43,6 +43,7 @@ diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml index 4a153df..6aa73c4 100644 --- a/src/Semi.Avalonia/Controls/TimePicker.axaml +++ b/src/Semi.Avalonia/Controls/TimePicker.axaml @@ -238,8 +238,7 @@ @@ -261,11 +260,11 @@