From 646f56d60acf1cfc2842b2f9c494737763f3d9e9 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 19 Sep 2024 23:28:57 +0800 Subject: [PATCH 01/21] feat: initialize aquatic theme. --- demo/Semi.Avalonia.Demo/App.axaml | 1 + .../Themes/Aquatic/Aquatic.axaml | 107 ++++++++++++++++++ src/Semi.Avalonia/Themes/SemiTheme.axaml | 4 +- src/Semi.Avalonia/Themes/SemiTheme.axaml.cs | 2 + 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml index 1e0383a..0beecc9 100644 --- a/demo/Semi.Avalonia.Demo/App.axaml +++ b/demo/Semi.Avalonia.Demo/App.axaml @@ -2,6 +2,7 @@ x:Class="Semi.Avalonia.Demo.App" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + RequestedThemeVariant="{x:Static semi:SemiTheme.Aquatic}" xmlns:semi="https://irihi.tech/semi"> diff --git a/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml b/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml new file mode 100644 index 0000000..56ffd32 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml @@ -0,0 +1,107 @@ + + + #202020 + #FFFFFF + #75E9FC + #A6A6A6 + #263B50 + #8EE3F0 + #202020 + #FFFFFF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml index 52c207f..b5f679c 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml +++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml @@ -1,9 +1,11 @@ - + + diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs b/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs index 23144a0..f0103a0 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs +++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs @@ -10,6 +10,8 @@ namespace Semi.Avalonia; public class SemiTheme : Styles { + public static ThemeVariant Aquatic => new ThemeVariant(nameof(Aquatic), ThemeVariant.Dark); + private static readonly Dictionary _localeToResource = new() { { new CultureInfo("zh-cn"), new zh_cn() }, From 2dbfcb38e3af0e500de0e443674a5d94f86897e5 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 20 Sep 2024 03:39:13 +0800 Subject: [PATCH 02/21] feat: finish aquatic. --- .../Themes/Aquatic/Aquatic.axaml | 708 ++++++++++++++++-- 1 file changed, 652 insertions(+), 56 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml b/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml index 56ffd32..65be66f 100644 --- a/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml +++ b/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml @@ -19,89 +19,685 @@ - - - - - - - + + + + + + + - - - + + + - + - + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bc49ce78e03b434c76f4aaf9f9cf436df186d9d9 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 20 Sep 2024 04:08:08 +0800 Subject: [PATCH 03/21] feat: add more high contrast themes. --- demo/Semi.Avalonia.Demo/App.axaml | 4 +- demo/Semi.Avalonia.Demo/Views/MainView.axaml | 35 +- .../Views/MainView.axaml.cs | 35 + .../{Aquatic => HighContrast}/Aquatic.axaml | 0 .../Themes/HighContrast/Desert.axaml | 703 ++++++++++++++++++ .../Themes/HighContrast/Dusk.axaml | 703 ++++++++++++++++++ .../Themes/HighContrast/NightSky.axaml | 703 ++++++++++++++++++ src/Semi.Avalonia/Themes/SemiTheme.axaml | 5 +- src/Semi.Avalonia/Themes/SemiTheme.axaml.cs | 3 + 9 files changed, 2165 insertions(+), 26 deletions(-) rename src/Semi.Avalonia/Themes/{Aquatic => HighContrast}/Aquatic.axaml (100%) create mode 100644 src/Semi.Avalonia/Themes/HighContrast/Desert.axaml create mode 100644 src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml create mode 100644 src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml index 0beecc9..f01ab5c 100644 --- a/demo/Semi.Avalonia.Demo/App.axaml +++ b/demo/Semi.Avalonia.Demo/App.axaml @@ -2,8 +2,8 @@ x:Class="Semi.Avalonia.Demo.App" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - RequestedThemeVariant="{x:Static semi:SemiTheme.Aquatic}" - xmlns:semi="https://irihi.tech/semi"> + + xmlns:semi="https://irihi.tech/semi"> diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml index 4a5bbbc..0c12b22 100644 --- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml +++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml @@ -5,8 +5,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pages="using:Semi.Avalonia.Demo.Pages" + xmlns:views="clr-namespace:Semi.Avalonia.Demo.Views" d:DesignHeight="450" d:DesignWidth="800" + x:CompileBindings="True" + x:DataType="views:MainViewModel" mc:Ignorable="d"> @@ -36,43 +39,29 @@ Margin="8,0" VerticalAlignment="Center" Classes="Secondary" - Text="{Binding #tab.SelectedItem.Header}" /> + Text="{ReflectionBinding #tab.SelectedItem.Header}" /> - - - - - - - - - - + diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs index a6aec59..b7e74a8 100644 --- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs @@ -1,8 +1,10 @@ using System; +using System.Collections.ObjectModel; using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Styling; +using CommunityToolkit.Mvvm.ComponentModel; namespace Semi.Avalonia.Demo.Views; @@ -11,6 +13,7 @@ public partial class MainView : UserControl public MainView() { InitializeComponent(); + this.DataContext = new MainViewModel(); } private void ToggleButton_OnIsCheckedChanged(object sender, RoutedEventArgs e) @@ -38,4 +41,36 @@ public partial class MainView : UserControl var launcher = top.Launcher; await launcher.LaunchUriAsync(new Uri("https://docs.irihi.tech/semi")); } +} + +public partial class MainViewModel: ObservableObject +{ + public ObservableCollection Themes { get; } = new() + { + new ThemeItem("Light", ThemeVariant.Light), + new ThemeItem("Dark", ThemeVariant.Dark), + new ThemeItem("Aquatic", SemiTheme.Aquatic), + new ThemeItem("Desert", SemiTheme.Desert), + new ThemeItem("Dust", SemiTheme.Dust), + new ThemeItem("NightSky", SemiTheme.NightSky), + }; + + [ObservableProperty] private ThemeItem? _selectedTheme; + + partial void OnSelectedThemeChanged(ThemeItem? oldValue, ThemeItem? newValue) + { + if (newValue is null) return; + var app = Application.Current; + if (app is not null) + { + app.RequestedThemeVariant = newValue.Theme; + } + } + +} + +public class ThemeItem(string name, ThemeVariant theme) +{ + public string Name { get; set; } = name; + public ThemeVariant Theme { get; set; } = theme; } \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml similarity index 100% rename from src/Semi.Avalonia/Themes/Aquatic/Aquatic.axaml rename to src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml new file mode 100644 index 0000000..cc44132 --- /dev/null +++ b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml @@ -0,0 +1,703 @@ + + + #FFFAEF + #3D3D3D + #1C5E75 + #676767 + #FFF5E3 + #903909 + #FFFAEF + #202020 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml new file mode 100644 index 0000000..69fee1d --- /dev/null +++ b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml @@ -0,0 +1,703 @@ + + + #2D3236 + #FFFFFF + #70EBDE + #A6A6A6 + #212D3B + #A1BFDE + #2D3236 + #B6F6F0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml new file mode 100644 index 0000000..3a896f1 --- /dev/null +++ b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml @@ -0,0 +1,703 @@ + + + #000000 + #FFFFFF + #8080FF + #A6A6A6 + #2B2B2B + #D6B4FD + #000000 + #FFEE32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml index b5f679c..5281aa0 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml +++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml @@ -5,7 +5,10 @@ - + + + + diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs b/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs index f0103a0..d178f31 100644 --- a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs +++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs @@ -11,6 +11,9 @@ namespace Semi.Avalonia; public class SemiTheme : Styles { public static ThemeVariant Aquatic => new ThemeVariant(nameof(Aquatic), ThemeVariant.Dark); + public static ThemeVariant Desert => new ThemeVariant(nameof(Desert), ThemeVariant.Light); + public static ThemeVariant Dust => new ThemeVariant(nameof(Dust), ThemeVariant.Dark); + public static ThemeVariant NightSky => new ThemeVariant(nameof(NightSky), ThemeVariant.Dark); private static readonly Dictionary _localeToResource = new() { From 2703002d5c513228d3b3fdbe332fec105a23678d Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:13:57 +0800 Subject: [PATCH 04/21] misc: extract resources. --- demo/Semi.Avalonia.Demo/App.axaml | 3 +- .../Themes/HighContrast/Aquatic.axaml | 698 +----------------- .../Themes/HighContrast/Base.axaml | 693 +++++++++++++++++ .../Themes/HighContrast/Desert.axaml | 698 +----------------- .../Themes/HighContrast/Dusk.axaml | 698 +----------------- .../Themes/HighContrast/NightSky.axaml | 698 +----------------- 6 files changed, 710 insertions(+), 2778 deletions(-) create mode 100644 src/Semi.Avalonia/Themes/HighContrast/Base.axaml diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml index f01ab5c..1e0383a 100644 --- a/demo/Semi.Avalonia.Demo/App.axaml +++ b/demo/Semi.Avalonia.Demo/App.axaml @@ -2,8 +2,7 @@ x:Class="Semi.Avalonia.Demo.App" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - - xmlns:semi="https://irihi.tech/semi"> + xmlns:semi="https://irihi.tech/semi"> diff --git a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml index 65be66f..fda47e5 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml @@ -1,5 +1,4 @@ - #202020 #FFFFFF #75E9FC @@ -8,696 +7,7 @@ #8EE3F0 #202020 #FFFFFF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml new file mode 100644 index 0000000..7e1a8d1 --- /dev/null +++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml @@ -0,0 +1,693 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml index cc44132..2540818 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml @@ -1,5 +1,4 @@ - #FFFAEF #3D3D3D #1C5E75 @@ -8,696 +7,7 @@ #903909 #FFFAEF #202020 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml index 69fee1d..3651dcd 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml @@ -1,5 +1,4 @@ - #2D3236 #FFFFFF #70EBDE @@ -8,696 +7,7 @@ #A1BFDE #2D3236 #B6F6F0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml index 3a896f1..13905bd 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml @@ -1,5 +1,4 @@ - #000000 #FFFFFF #8080FF @@ -8,696 +7,7 @@ #D6B4FD #000000 #FFEE32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file From cd0422a64e53ecdf83c77a492f617e7b0c6d75ae Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:40:52 +0800 Subject: [PATCH 05/21] misc: delete "Add Resources Here". --- demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml | 1 - .../Controls/FunctionalColorGroupControl.axaml | 2 -- demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml | 2 -- demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml | 1 - src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml | 1 - src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml | 1 - src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml | 2 -- src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml | 1 - src/Semi.Avalonia.DataGrid/DataGrid.axaml | 1 - src/Semi.Avalonia.TreeDataGrid/Dark.axaml | 1 - src/Semi.Avalonia.TreeDataGrid/Index.axaml | 1 - src/Semi.Avalonia.TreeDataGrid/Light.axaml | 1 - src/Semi.Avalonia.TreeDataGrid/Shared.axaml | 1 - src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml | 1 - src/Semi.Avalonia/Controls/Calendar.axaml | 2 -- src/Semi.Avalonia/Controls/CalendarDatePicker.axaml | 1 - src/Semi.Avalonia/Controls/CaptionButtons.axaml | 2 -- src/Semi.Avalonia/Controls/Carousel.axaml | 1 - src/Semi.Avalonia/Controls/DataValidationErrors.axaml | 1 - src/Semi.Avalonia/Controls/DatePicker.axaml | 1 - src/Semi.Avalonia/Controls/DateTimePickerShared.axaml | 2 -- src/Semi.Avalonia/Controls/DropDownButton.axaml | 1 - src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml | 2 -- src/Semi.Avalonia/Controls/ManagedFileChooser.axaml | 1 - src/Semi.Avalonia/Controls/NumericUpDown.axaml | 1 - src/Semi.Avalonia/Controls/RefreshContainer.axaml | 1 - src/Semi.Avalonia/Controls/Slider.axaml | 1 - src/Semi.Avalonia/Controls/SplitView.axaml | 2 -- src/Semi.Avalonia/Controls/TabControl.axaml | 1 - src/Semi.Avalonia/Controls/TabStrip.axaml | 1 - src/Semi.Avalonia/Controls/ThemeVariantScope.axaml | 2 -- src/Semi.Avalonia/Controls/TimePicker.axaml | 2 -- src/Semi.Avalonia/Controls/TitleBar.axaml | 1 - src/Semi.Avalonia/Controls/Tooltip.axaml | 1 - 34 files changed, 44 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml index abcbd39..4dc7d42 100644 --- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml +++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml @@ -7,7 +7,6 @@ x:DataType="viewModels:ColorItemViewModel"> M5 7C3.89543 7 3 7.89543 3 9V19C3 20.1046 3.89543 21 5 21H15C16.1046 21 17 20.1046 17 19V9C17 7.89543 16.1046 7 15 7H5Z,M7 4C7 2.89543 7.89543 2 9 2H20C21.1046 2 22 2.89543 22 4V15C22 16.1046 21.1046 17 20 17H19V8C19 6 18 5 16 5H7V4Z - diff --git a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml index a557a7b..b3d46be 100644 --- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml +++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml @@ -5,9 +5,7 @@ xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels" x:CompileBindings="True" x:DataType="viewModels:FunctionalColorGroupViewModel"> - - diff --git a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml index ccdbbf4..12fc2df 100644 --- a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml +++ b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml @@ -1,8 +1,6 @@ - - - diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml index 514af34..ea7d2a7 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml @@ -5,7 +5,6 @@ xmlns:converters="using:Avalonia.Controls.Converters" xmlns:primitives="using:Avalonia.Controls.Primitives" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml index 67a5f86..f49f41c 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml @@ -4,7 +4,6 @@ xmlns:converters="using:Avalonia.Controls.Converters" xmlns:pc="using:Avalonia.Controls.Primitives.Converters" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml index 3389404..8b7fe64 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml @@ -3,8 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="using:Avalonia.Controls.Converters" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml index a2f5ced..4bc308e 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml @@ -4,7 +4,6 @@ xmlns:controls="using:Avalonia.Controls" xmlns:converters="using:Avalonia.Controls.Converters" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia.DataGrid/DataGrid.axaml b/src/Semi.Avalonia.DataGrid/DataGrid.axaml index 7793490..6a25ff3 100644 --- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml +++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml @@ -3,7 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:collections="using:Avalonia.Collections" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml index 2f5ee54..f49426f 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml @@ -1,5 +1,4 @@ - diff --git a/src/Semi.Avalonia.TreeDataGrid/Index.axaml b/src/Semi.Avalonia.TreeDataGrid/Index.axaml index b557af1..f67ed3c 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml @@ -1,5 +1,4 @@ - diff --git a/src/Semi.Avalonia.TreeDataGrid/Light.axaml b/src/Semi.Avalonia.TreeDataGrid/Light.axaml index f15e970..73c6c8b 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Light.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Light.axaml @@ -1,5 +1,4 @@ - diff --git a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml index b48fab4..dd2a475 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml @@ -1,5 +1,4 @@ - M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml index 9a83369..c9e2cbe 100644 --- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls.TreeDataGrid"> - diff --git a/src/Semi.Avalonia/Controls/Calendar.axaml b/src/Semi.Avalonia/Controls/Calendar.axaml index 14d3264..378243a 100644 --- a/src/Semi.Avalonia/Controls/Calendar.axaml +++ b/src/Semi.Avalonia/Controls/Calendar.axaml @@ -2,8 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml index d9deb27..67b98b3 100644 --- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/CaptionButtons.axaml b/src/Semi.Avalonia/Controls/CaptionButtons.axaml index 1ab3b00..753cc3a 100644 --- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml +++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml @@ -2,8 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml index d6beab9..4b48df4 100644 --- a/src/Semi.Avalonia/Controls/Carousel.axaml +++ b/src/Semi.Avalonia/Controls/Carousel.axaml @@ -3,7 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="clr-namespace:Semi.Avalonia.Converters" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml index a91ebf0..b5dcab8 100644 --- a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml +++ b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:collections="clr-namespace:System.Collections;assembly=netstandard"> - diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml index 253ac10..353c2ac 100644 --- a/src/Semi.Avalonia/Controls/DatePicker.axaml +++ b/src/Semi.Avalonia/Controls/DatePicker.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml index 6addc9c..d863f10 100644 --- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml @@ -2,8 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia/Controls/DropDownButton.axaml b/src/Semi.Avalonia/Controls/DropDownButton.axaml index 1528e70..bf09293 100644 --- a/src/Semi.Avalonia/Controls/DropDownButton.axaml +++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml index a0465d4..09a16db 100644 --- a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml +++ b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml @@ -1,6 +1,4 @@ - - diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml index b86b576..e461318 100644 --- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml +++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml @@ -6,7 +6,6 @@ xmlns:internal="clr-namespace:Avalonia.Dialogs.Internal;assembly=Avalonia.Dialogs" xmlns:cvt="using:Avalonia.Controls.Converters" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia/Controls/RefreshContainer.axaml b/src/Semi.Avalonia/Controls/RefreshContainer.axaml index 48497c7..c785d79 100644 --- a/src/Semi.Avalonia/Controls/RefreshContainer.axaml +++ b/src/Semi.Avalonia/Controls/RefreshContainer.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml index 1af8a6b..af43caf 100644 --- a/src/Semi.Avalonia/Controls/Slider.axaml +++ b/src/Semi.Avalonia/Controls/Slider.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml index 852ffc2..f940c67 100644 --- a/src/Semi.Avalonia/Controls/SplitView.axaml +++ b/src/Semi.Avalonia/Controls/SplitView.axaml @@ -1,6 +1,4 @@ - - diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml index bd514f1..a408fd3 100644 --- a/src/Semi.Avalonia/Controls/TabControl.axaml +++ b/src/Semi.Avalonia/Controls/TabControl.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/TabStrip.axaml b/src/Semi.Avalonia/Controls/TabStrip.axaml index fa5a9d1..23ea298 100644 --- a/src/Semi.Avalonia/Controls/TabStrip.axaml +++ b/src/Semi.Avalonia/Controls/TabStrip.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml b/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml index 6267f74..8b3e72e 100644 --- a/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml +++ b/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml @@ -2,9 +2,7 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml index e913134..f45b389 100644 --- a/src/Semi.Avalonia/Controls/TimePicker.axaml +++ b/src/Semi.Avalonia/Controls/TimePicker.axaml @@ -2,8 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - - diff --git a/src/Semi.Avalonia/Controls/TitleBar.axaml b/src/Semi.Avalonia/Controls/TitleBar.axaml index de0b3cd..3fa988e 100644 --- a/src/Semi.Avalonia/Controls/TitleBar.axaml +++ b/src/Semi.Avalonia/Controls/TitleBar.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - diff --git a/src/Semi.Avalonia/Controls/Tooltip.axaml b/src/Semi.Avalonia/Controls/Tooltip.axaml index 080b8a1..8e6b405 100644 --- a/src/Semi.Avalonia/Controls/Tooltip.axaml +++ b/src/Semi.Avalonia/Controls/Tooltip.axaml @@ -2,7 +2,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - From a28ac1c45033ab8ee9fac8117fa2f2b926973611 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:28:53 +0800 Subject: [PATCH 06/21] feat: Button. --- src/Semi.Avalonia/Controls/Button.axaml | 8 +- src/Semi.Avalonia/Themes/Dark/Button.axaml | 5 + .../Themes/HighContrast/Base.axaml | 159 +++++++----------- src/Semi.Avalonia/Themes/Light/Button.axaml | 5 + 4 files changed, 72 insertions(+), 105 deletions(-) diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml index 0a46233..9e4fcac 100644 --- a/src/Semi.Avalonia/Controls/Button.axaml +++ b/src/Semi.Avalonia/Controls/Button.axaml @@ -252,12 +252,12 @@ BasedOn="{StaticResource {x:Type Button}}" TargetType="Button"> diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index 73279bf..8e28633 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -82,6 +82,11 @@ + + + + + diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml index 7e1a8d1..dfec010 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml @@ -10,91 +10,48 @@ - - - - - - + - - - - + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - + @@ -102,7 +59,7 @@ - + @@ -137,7 +94,7 @@ - + @@ -147,20 +104,20 @@ - + - + - + @@ -182,7 +139,7 @@ - + @@ -194,7 +151,7 @@ - + @@ -213,7 +170,7 @@ - + @@ -237,7 +194,7 @@ - + @@ -263,7 +220,7 @@ - + @@ -272,26 +229,26 @@ - + - + - + - - - - - - - + + + + + + + @@ -304,7 +261,7 @@ - + @@ -384,14 +341,14 @@ - + - + - + @@ -412,7 +369,7 @@ - + @@ -422,7 +379,7 @@ - + @@ -432,7 +389,7 @@ - + @@ -445,7 +402,7 @@ - + @@ -478,7 +435,7 @@ - + @@ -493,18 +450,18 @@ - + - + - + @@ -518,12 +475,12 @@ - + - + - + @@ -533,7 +490,7 @@ - + @@ -550,7 +507,7 @@ - + @@ -573,7 +530,7 @@ - + @@ -657,7 +614,7 @@ - + @@ -673,7 +630,7 @@ - + @@ -686,7 +643,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml index adbc890..37492b3 100644 --- a/src/Semi.Avalonia/Themes/Light/Button.axaml +++ b/src/Semi.Avalonia/Themes/Light/Button.axaml @@ -82,6 +82,11 @@ + + + + + From 8db28efd8ebb1d1545ffc71aa838bf8e88c4f07a Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:46:10 +0800 Subject: [PATCH 07/21] misc: rename resources. --- .../Themes/HighContrast/Aquatic.axaml | 16 +- .../Themes/HighContrast/Base.axaml | 778 +++++++++--------- .../Themes/HighContrast/Desert.axaml | 16 +- .../Themes/HighContrast/Dusk.axaml | 16 +- .../Themes/HighContrast/NightSky.axaml | 16 +- 5 files changed, 421 insertions(+), 421 deletions(-) diff --git a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml index fda47e5..26f4875 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml @@ -1,12 +1,12 @@ - #202020 - #FFFFFF - #75E9FC - #A6A6A6 - #263B50 - #8EE3F0 - #202020 - #FFFFFF + #202020 + #FFFFFF + #75E9FC + #A6A6A6 + #263B50 + #8EE3F0 + #FFFFFF + #202020 diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml index dfec010..ad0e027 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml @@ -1,20 +1,20 @@  - + - - + + - - + + - - + + - - - + + + @@ -23,17 +23,17 @@ - + - - - + + + - - - + + + - + @@ -43,344 +43,344 @@ - - - + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - + + - - - - - - - + + + + + + + - - + + - - + + - - + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - + + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - + + - - - - - - + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - + - - - + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - + + - - + + - - - - - + + + + + - + - - - - - - - + + + + + + + - + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + - - - + + + - - - - - - + + + + + + - + - - - - - - + + + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + @@ -391,12 +391,12 @@ - - - - - - + + + + + + @@ -404,247 +404,247 @@ - + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - + - + - - - + + + - - - + + + - + - + - - - + + + - - + + - + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - - - + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml index 2540818..af3b6db 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml @@ -1,12 +1,12 @@ - #FFFAEF - #3D3D3D - #1C5E75 - #676767 - #FFF5E3 - #903909 - #FFFAEF - #202020 + #FFFAEF + #3D3D3D + #1C5E75 + #676767 + #FFF5E3 + #903909 + #202020 + #FFFAEF diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml index 3651dcd..4e25223 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml @@ -1,12 +1,12 @@ - #2D3236 - #FFFFFF - #70EBDE - #A6A6A6 - #212D3B - #A1BFDE - #2D3236 - #B6F6F0 + #2D3236 + #FFFFFF + #70EBDE + #A6A6A6 + #212D3B + #A1BFDE + #B6F6F0 + #2D3236 diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml index 13905bd..18f79d7 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml @@ -1,12 +1,12 @@ - #000000 - #FFFFFF - #8080FF - #A6A6A6 - #2B2B2B - #D6B4FD - #000000 - #FFEE32 + #000000 + #FFFFFF + #8080FF + #A6A6A6 + #2B2B2B + #D6B4FD + #FFEE32 + #000000 From 5da85a27f648456d7aaf76264d5c90898877b78e Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:09:35 +0800 Subject: [PATCH 08/21] feat: alter AutoCompleteBox. --- .../Controls/AutoCompleteBox.axaml | 6 +- src/Semi.Avalonia/Controls/ListBox.axaml | 108 +++++++++--------- src/Semi.Avalonia/Controls/TextBox.axaml | 104 ++++++++--------- src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 3 + .../Themes/HighContrast/Base.axaml | 10 +- src/Semi.Avalonia/Themes/Light/ListBox.axaml | 3 + 6 files changed, 120 insertions(+), 114 deletions(-) diff --git a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml index d3e18ef..8aa84a6 100644 --- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml +++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml index 34439ec..c8b738d 100644 --- a/src/Semi.Avalonia/Controls/ListBox.axaml +++ b/src/Semi.Avalonia/Controls/ListBox.axaml @@ -16,7 +16,7 @@ - + - - - - + + + + @@ -209,9 +210,9 @@ diff --git a/src/Semi.Avalonia/Controls/DropDownButton.axaml b/src/Semi.Avalonia/Controls/DropDownButton.axaml index bf09293..d94d29d 100644 --- a/src/Semi.Avalonia/Controls/DropDownButton.axaml +++ b/src/Semi.Avalonia/Controls/DropDownButton.axaml @@ -229,11 +229,11 @@ diff --git a/src/Semi.Avalonia/Controls/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml index 027b580..98e76d7 100644 --- a/src/Semi.Avalonia/Controls/SplitButton.axaml +++ b/src/Semi.Avalonia/Controls/SplitButton.axaml @@ -224,6 +224,7 @@ @@ -306,7 +307,7 @@ diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index 8e28633..65432c3 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -23,6 +23,7 @@ + @@ -69,7 +70,9 @@ + + diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml index 11419fb..db18198 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml @@ -9,31 +9,34 @@ - + - - - + + + - - + + - + - + - - + + + - - + + + + @@ -126,16 +129,16 @@ - - - - - + + + + + - - + + @@ -144,13 +147,13 @@ - - + + - + - - + + @@ -243,11 +246,12 @@ + - + - + @@ -267,22 +271,22 @@ - - + + - + - + - + - + - + @@ -304,10 +308,10 @@ - - - - + + + + @@ -318,31 +322,31 @@ - - - - - + + + + + - - + + - - + + - + - + @@ -414,18 +418,18 @@ - - - + + + - + - + @@ -447,11 +451,11 @@ - - - - - + + + + + diff --git a/src/Semi.Avalonia/Themes/Light/Button.axaml b/src/Semi.Avalonia/Themes/Light/Button.axaml index 37492b3..4365120 100644 --- a/src/Semi.Avalonia/Themes/Light/Button.axaml +++ b/src/Semi.Avalonia/Themes/Light/Button.axaml @@ -23,6 +23,7 @@ + @@ -69,7 +70,9 @@ + + From 25c3e874f3fb9e6d299407cc9ba0d2ded8becfb2 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Wed, 25 Sep 2024 20:57:09 +0800 Subject: [PATCH 10/21] feat: ComboBox. --- src/Semi.Avalonia/Controls/ComboBox.axaml | 9 ++++++-- src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 5 +++++ src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 6 +++--- .../Themes/HighContrast/Base.axaml | 21 ++++++------------- src/Semi.Avalonia/Themes/Light/ComboBox.axaml | 5 +++++ 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml index 0068c66..4742a82 100644 --- a/src/Semi.Avalonia/Controls/ComboBox.axaml +++ b/src/Semi.Avalonia/Controls/ComboBox.axaml @@ -32,6 +32,7 @@ + @@ -114,8 +115,7 @@ ClipToBounds="False" InheritsTransform="True" IsLightDismissEnabled="True" - IsOpen="{TemplateBinding IsDropDownOpen, - Mode=TwoWay}" + IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}" PlacementTarget="Background" WindowManagerAddShadowHint="False"> @@ -299,10 +300,12 @@ @@ -311,10 +314,12 @@ diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml index 5d8a707..02a1b71 100644 --- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml @@ -4,6 +4,7 @@ + @@ -24,9 +25,13 @@ + + + + diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml index 7337485..9511231 100644 --- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml @@ -3,11 +3,11 @@ - + - + - + diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml index db18198..77e2724 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml @@ -109,11 +109,6 @@ - - - - - @@ -161,6 +156,7 @@ + @@ -177,27 +173,22 @@ - + + + + + - - - - - - - - - diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml index 8fc128f..2225e15 100644 --- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml +++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml @@ -4,6 +4,7 @@ + @@ -23,9 +24,13 @@ + + + + From 72ccb80e5ffa75752c5dad5d462684a25f61319a Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 27 Sep 2024 15:56:08 +0800 Subject: [PATCH 11/21] feat: TextBox related. --- .../Controls/CalendarDatePicker.axaml | 1 + .../Controls/DateTimePickerShared.axaml | 1 + src/Semi.Avalonia/Controls/TextBox.axaml | 2 + .../Themes/Dark/CalendarDatePicker.axaml | 2 + .../Themes/Dark/DateTimePickerShared.axaml | 1 + src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 1 + .../Themes/HighContrast/Base.axaml | 53 ++++++++++--------- .../Themes/Light/CalendarDatePicker.axaml | 2 + .../Themes/Light/DateTimePickerShared.axaml | 1 + src/Semi.Avalonia/Themes/Light/TextBox.axaml | 1 + 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml index 67b98b3..15ed2a2 100644 --- a/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Controls/CalendarDatePicker.axaml @@ -140,6 +140,7 @@ diff --git a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml index d863f10..6fa26a2 100644 --- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml @@ -24,6 +24,7 @@ diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml index e7526b4..8af8827 100644 --- a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml @@ -8,9 +8,9 @@ - - - + + + - - - - + + + + + diff --git a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml index 86a3abd..29fa9fd 100644 --- a/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ButtonSpinner.axaml @@ -1,6 +1,7 @@ + diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml index a781405..9d4c00c 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml @@ -47,7 +47,7 @@ - + @@ -57,9 +57,10 @@ - - - + + + + diff --git a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml index c8a51fd..0e7e367 100644 --- a/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml +++ b/src/Semi.Avalonia/Themes/Light/ButtonSpinner.axaml @@ -1,6 +1,7 @@ + From 56c30dcb8b42b2847fa0b403181ca5a5ec01c1ff Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:32:13 +0800 Subject: [PATCH 13/21] feat: Expander. --- src/Semi.Avalonia/Controls/Expander.axaml | 22 +++++++++---------- src/Semi.Avalonia/Controls/GridSplitter.axaml | 4 ++-- .../Themes/HighContrast/Base.axaml | 6 ++--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/Semi.Avalonia/Controls/Expander.axaml b/src/Semi.Avalonia/Controls/Expander.axaml index a7aea15..b151aba 100644 --- a/src/Semi.Avalonia/Controls/Expander.axaml +++ b/src/Semi.Avalonia/Controls/Expander.axaml @@ -9,7 +9,7 @@ - + - - - - - - - + + + + + + + @@ -37,8 +37,7 @@ Background="{DynamicResource ExpanderHeaderDefaultBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" - IsChecked="{TemplateBinding IsExpanded, - Mode=TwoWay}" + IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}" IsEnabled="{TemplateBinding IsEnabled}" TextElement.FontWeight="{DynamicResource ExpanderHeaderFontWeight}" TextElement.Foreground="{DynamicResource ExpanderHeaderForeground}" @@ -77,8 +76,7 @@ Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Foreground="{DynamicResource ExpanderContentForeground}" - IsVisible="{TemplateBinding IsExpanded, - Mode=TwoWay}" /> + IsVisible="{TemplateBinding IsExpanded, Mode=TwoWay}" /> diff --git a/src/Semi.Avalonia/Controls/GridSplitter.axaml b/src/Semi.Avalonia/Controls/GridSplitter.axaml index 0748fa6..cbb9414 100644 --- a/src/Semi.Avalonia/Controls/GridSplitter.axaml +++ b/src/Semi.Avalonia/Controls/GridSplitter.axaml @@ -6,8 +6,8 @@ - - + +