From 62935eee6adb4d35c1d3a293380a14421d2c6e97 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Mon, 2 Dec 2024 16:52:03 +0800
Subject: [PATCH 01/42] misc: revert high-contrast Theme feat.
---
.../Controls/ColorDetailControl.axaml | 1 +
.../FunctionalColorGroupControl.axaml | 2 +
demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml | 2 +
.../Themes/ToggleButton.axaml | 1 +
demo/Semi.Avalonia.Demo/Views/MainView.axaml | 35 ++++--
.../Views/MainView.axaml.cs | 35 ------
.../Controls/ColorPicker.axaml | 1 +
.../Controls/ColorPreviewer.axaml | 1 +
.../Controls/ColorSlider.axaml | 2 +
.../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 +
.../TreeDataGrid.axaml | 1 +
.../Controls/AutoCompleteBox.axaml | 6 +-
src/Semi.Avalonia/Controls/Button.axaml | 14 +--
.../Controls/ButtonSpinner.axaml | 17 ++-
src/Semi.Avalonia/Controls/Calendar.axaml | 22 ++--
.../Controls/CalendarDatePicker.axaml | 3 +-
.../Controls/CaptionButtons.axaml | 2 +
src/Semi.Avalonia/Controls/Carousel.axaml | 1 +
src/Semi.Avalonia/Controls/ComboBox.axaml | 9 +-
.../Controls/DataValidationErrors.axaml | 1 +
src/Semi.Avalonia/Controls/DatePicker.axaml | 3 +-
.../Controls/DateTimePickerShared.axaml | 3 +-
.../Controls/DropDownButton.axaml | 5 +-
.../Controls/EmbeddableControlRoot.axaml | 2 +
src/Semi.Avalonia/Controls/Expander.axaml | 22 ++--
src/Semi.Avalonia/Controls/GridSplitter.axaml | 4 +-
src/Semi.Avalonia/Controls/ListBox.axaml | 108 +++++++++---------
.../Controls/ManagedFileChooser.axaml | 1 +
src/Semi.Avalonia/Controls/Menu.axaml | 12 --
.../Controls/NumericUpDown.axaml | 1 +
.../Controls/RefreshContainer.axaml | 1 +
src/Semi.Avalonia/Controls/RepeatButton.axaml | 14 +--
src/Semi.Avalonia/Controls/Slider.axaml | 1 +
src/Semi.Avalonia/Controls/SplitButton.axaml | 3 +-
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/TextBox.axaml | 106 +++++++++--------
.../Controls/ThemeVariantScope.axaml | 2 +
src/Semi.Avalonia/Controls/TimePicker.axaml | 4 +-
src/Semi.Avalonia/Controls/TitleBar.axaml | 1 +
src/Semi.Avalonia/Controls/ToggleButton.axaml | 7 --
src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 4 -
src/Semi.Avalonia/Controls/Tooltip.axaml | 1 +
src/Semi.Avalonia/Controls/TreeView.axaml | 28 ++---
src/Semi.Avalonia/Themes/Dark/Button.axaml | 8 --
.../Themes/Dark/ButtonSpinner.axaml | 1 -
.../Themes/Dark/CalendarDatePicker.axaml | 2 -
src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 5 -
.../Themes/Dark/DateTimePickerShared.axaml | 2 -
src/Semi.Avalonia/Themes/Dark/ListBox.axaml | 3 -
src/Semi.Avalonia/Themes/Dark/Menu.axaml | 1 -
src/Semi.Avalonia/Themes/Dark/TextBox.axaml | 1 -
.../Themes/Dark/ToggleButton.axaml | 4 -
.../Themes/Dark/ToggleSwitch.axaml | 2 -
src/Semi.Avalonia/Themes/Dark/TreeView.axaml | 2 -
.../Themes/HighContrast/AdornerLayer.axaml | 3 -
.../Themes/HighContrast/Aquatic.axaml | 13 ---
.../Themes/HighContrast/AutoCompleteBox.axaml | 4 -
.../Themes/HighContrast/Border.axaml | 4 -
.../Themes/HighContrast/Button.axaml | 48 --------
.../Themes/HighContrast/ButtonSpinner.axaml | 9 --
.../Themes/HighContrast/Calendar.axaml | 35 ------
.../HighContrast/CalendarDatePicker.axaml | 12 --
.../Themes/HighContrast/CaptionButtons.axaml | 7 --
.../Themes/HighContrast/Carousel.axaml | 2 -
.../Themes/HighContrast/CheckBox.axaml | 34 ------
.../Themes/HighContrast/ComboBox.axaml | 39 -------
.../HighContrast/DataValidationErrors.axaml | 11 --
.../Themes/HighContrast/DatePicker.axaml | 2 -
.../HighContrast/DateTimePickerShared.axaml | 28 -----
.../Themes/HighContrast/Desert.axaml | 13 ---
.../Themes/HighContrast/DropDownButton.axaml | 2 -
.../Themes/HighContrast/Dusk.axaml | 13 ---
.../Themes/HighContrast/Expander.axaml | 9 --
.../Themes/HighContrast/Flyout.axaml | 5 -
.../Themes/HighContrast/GridSplitter.axaml | 4 -
.../HighContrast/HeaderedContentControl.axaml | 4 -
.../Themes/HighContrast/HyperlinkButton.axaml | 7 --
.../Themes/HighContrast/Label.axaml | 2 -
.../Themes/HighContrast/ListBox.axaml | 96 ----------------
.../HighContrast/ManagedFileChooser.axaml | 4 -
.../Themes/HighContrast/Menu.axaml | 24 ----
.../Themes/HighContrast/NightSky.axaml | 13 ---
.../HighContrast/NotificationCard.axaml | 8 --
.../Themes/HighContrast/NumericUpDown.axaml | 2 -
.../Themes/HighContrast/ProgressBar.axaml | 8 --
.../Themes/HighContrast/RadioButton.axaml | 49 --------
.../HighContrast/RefreshContainer.axaml | 4 -
.../Themes/HighContrast/ScrollViewer.axaml | 7 --
.../Themes/HighContrast/Slider.axaml | 14 ---
.../Themes/HighContrast/SplitButton.axaml | 2 -
.../Themes/HighContrast/SplitView.axaml | 5 -
.../Themes/HighContrast/TabControl.axaml | 2 -
.../Themes/HighContrast/TabItem.axaml | 11 --
.../Themes/HighContrast/TextBlock.axaml | 10 --
.../Themes/HighContrast/TextBox.axaml | 19 ---
.../Themes/HighContrast/TimePicker.axaml | 2 -
.../Themes/HighContrast/ToggleButton.axaml | 32 ------
.../Themes/HighContrast/ToggleSwitch.axaml | 18 ---
.../Themes/HighContrast/Tooltip.axaml | 5 -
.../Themes/HighContrast/TreeView.axaml | 15 ---
.../Themes/HighContrast/Window.axaml | 4 -
.../Themes/HighContrast/_index.axaml | 47 --------
src/Semi.Avalonia/Themes/Light/Button.axaml | 8 --
.../Themes/Light/ButtonSpinner.axaml | 1 -
.../Themes/Light/CalendarDatePicker.axaml | 2 -
src/Semi.Avalonia/Themes/Light/ComboBox.axaml | 5 -
.../Themes/Light/DateTimePickerShared.axaml | 2 -
src/Semi.Avalonia/Themes/Light/ListBox.axaml | 3 -
src/Semi.Avalonia/Themes/Light/Menu.axaml | 1 -
src/Semi.Avalonia/Themes/Light/TextBox.axaml | 1 -
.../Themes/Light/ToggleButton.axaml | 4 -
.../Themes/Light/ToggleSwitch.axaml | 2 -
src/Semi.Avalonia/Themes/Light/TreeView.axaml | 2 -
src/Semi.Avalonia/Themes/SemiTheme.axaml | 7 +-
src/Semi.Avalonia/Themes/SemiTheme.axaml.cs | 5 -
src/Semi.Avalonia/Themes/Shared/Tooltip.axaml | 2 +-
123 files changed, 240 insertions(+), 1046 deletions(-)
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/AdornerLayer.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/AutoCompleteBox.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Border.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Button.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ButtonSpinner.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Calendar.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/CalendarDatePicker.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/CaptionButtons.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Carousel.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/CheckBox.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ComboBox.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/DataValidationErrors.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/DatePicker.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/DateTimePickerShared.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/DropDownButton.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Expander.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Flyout.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/GridSplitter.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/HeaderedContentControl.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Label.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ListBox.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ManagedFileChooser.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Menu.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/NotificationCard.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/NumericUpDown.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ProgressBar.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/RadioButton.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/RefreshContainer.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ScrollViewer.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Slider.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/SplitButton.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/SplitView.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/TextBlock.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/TextBox.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/TimePicker.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ToggleButton.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/ToggleSwitch.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Tooltip.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/TreeView.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/Window.axaml
delete mode 100644 src/Semi.Avalonia/Themes/HighContrast/_index.axaml
diff --git a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
index 4dc7d42d..abcbd397 100644
--- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml
@@ -7,6 +7,7 @@
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 b3d46be0..a557a7bf 100644
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
@@ -5,7 +5,9 @@
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 12fc2df0..ccdbbf46 100644
--- a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
+++ b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
@@ -1,6 +1,8 @@
+
+
+
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
index 0c12b22d..4a5bbbca 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -5,11 +5,8 @@
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">
@@ -39,29 +36,43 @@
Margin="8,0"
VerticalAlignment="Center"
Classes="Secondary"
- Text="{ReflectionBinding #tab.SelectedItem.Header}" />
+ Text="{Binding #tab.SelectedItem.Header}" />
-
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
index b7e74a88..a6aec592 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
@@ -1,10 +1,8 @@
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;
@@ -13,7 +11,6 @@ public partial class MainView : UserControl
public MainView()
{
InitializeComponent();
- this.DataContext = new MainViewModel();
}
private void ToggleButton_OnIsCheckedChanged(object sender, RoutedEventArgs e)
@@ -41,36 +38,4 @@ private async void OpenDocumentation(object sender, RoutedEventArgs e)
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.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
index ea7d2a71..514af342 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -5,6 +5,7 @@
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 f49f41cd..67a5f86a 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPreviewer.axaml
@@ -4,6 +4,7 @@
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 8b7fe649..33894042 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSlider.axaml
@@ -3,6 +3,8 @@
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 4bc308ed..a2f5ced0 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorSpectrum.axaml
@@ -4,6 +4,7 @@
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 6a25ff39..77934902 100644
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -3,6 +3,7 @@
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 f49426fe..2f5ee543 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Dark.axaml
@@ -1,4 +1,5 @@
+
diff --git a/src/Semi.Avalonia.TreeDataGrid/Index.axaml b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
index f67ed3c3..b557af17 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
@@ -1,4 +1,5 @@
+
diff --git a/src/Semi.Avalonia.TreeDataGrid/Light.axaml b/src/Semi.Avalonia.TreeDataGrid/Light.axaml
index 73c6c8b3..f15e9700 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Light.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Light.axaml
@@ -1,4 +1,5 @@
+
diff --git a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
index dd2a475c..b48fab44 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Shared.axaml
@@ -1,4 +1,5 @@
+
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 c9e2cbe3..9a833697 100644
--- a/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml
@@ -2,6 +2,7 @@
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/AutoCompleteBox.axaml b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
index 8aa84a6c..d3e18efa 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/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index 27ce9d53..0a462331 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -113,7 +113,6 @@
@@ -129,7 +128,6 @@
@@ -211,9 +209,9 @@
@@ -254,12 +252,12 @@
BasedOn="{StaticResource {x:Type Button}}"
TargetType="Button">
diff --git a/src/Semi.Avalonia/Controls/ButtonSpinner.axaml b/src/Semi.Avalonia/Controls/ButtonSpinner.axaml
index 8af88272..e7526b46 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/Controls/Calendar.axaml b/src/Semi.Avalonia/Controls/Calendar.axaml
index 15a6bbbf..14d32642 100644
--- a/src/Semi.Avalonia/Controls/Calendar.axaml
+++ b/src/Semi.Avalonia/Controls/Calendar.axaml
@@ -2,12 +2,14 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True">
+
+
-
+
@@ -29,9 +31,9 @@
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
+
@@ -102,6 +103,7 @@
CornerRadius="{DynamicResource CalendarCornerRadius}">
diff --git a/src/Semi.Avalonia/Controls/CaptionButtons.axaml b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
index 753cc3af..1ab3b00e 100644
--- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
@@ -2,6 +2,8 @@
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 4b48df4a..d6beab9b 100644
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -3,6 +3,7 @@
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/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 4742a828..0068c661 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -32,7 +32,6 @@
-
@@ -115,7 +114,8 @@
ClipToBounds="False"
InheritsTransform="True"
IsLightDismissEnabled="True"
- IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
+ IsOpen="{TemplateBinding IsDropDownOpen,
+ Mode=TwoWay}"
PlacementTarget="Background"
WindowManagerAddShadowHint="False">
@@ -300,12 +299,10 @@
@@ -314,12 +311,10 @@
diff --git a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
index b5dcab8f..a91ebf09 100644
--- a/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
+++ b/src/Semi.Avalonia/Controls/DataValidationErrors.axaml
@@ -2,6 +2,7 @@
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 9603b19e..253ac10f 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -2,14 +2,13 @@
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 6fa26a2f..6addc9c5 100644
--- a/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
@@ -2,6 +2,8 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True">
+
+
@@ -24,7 +26,6 @@
diff --git a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
index 09a16db2..a0465d46 100644
--- a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
+++ b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
@@ -1,4 +1,6 @@
+
+
diff --git a/src/Semi.Avalonia/Controls/Expander.axaml b/src/Semi.Avalonia/Controls/Expander.axaml
index b151aba3..a7aea153 100644
--- a/src/Semi.Avalonia/Controls/Expander.axaml
+++ b/src/Semi.Avalonia/Controls/Expander.axaml
@@ -9,7 +9,7 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -37,7 +37,8 @@
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}"
@@ -76,7 +77,8 @@
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 cbb9414a..0748fa6b 100644
--- a/src/Semi.Avalonia/Controls/GridSplitter.axaml
+++ b/src/Semi.Avalonia/Controls/GridSplitter.axaml
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml
index c8b738d8..34439eca 100644
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -16,7 +16,7 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
@@ -365,9 +356,6 @@
-
diff --git a/src/Semi.Avalonia/Controls/NumericUpDown.axaml b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
index 3a4210d6..b9708936 100644
--- a/src/Semi.Avalonia/Controls/NumericUpDown.axaml
+++ b/src/Semi.Avalonia/Controls/NumericUpDown.axaml
@@ -2,6 +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/RefreshContainer.axaml b/src/Semi.Avalonia/Controls/RefreshContainer.axaml
index c785d79d..48497c75 100644
--- a/src/Semi.Avalonia/Controls/RefreshContainer.axaml
+++ b/src/Semi.Avalonia/Controls/RefreshContainer.axaml
@@ -2,6 +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/RepeatButton.axaml b/src/Semi.Avalonia/Controls/RepeatButton.axaml
index ed8bafd1..357c94f0 100644
--- a/src/Semi.Avalonia/Controls/RepeatButton.axaml
+++ b/src/Semi.Avalonia/Controls/RepeatButton.axaml
@@ -108,7 +108,6 @@
@@ -124,7 +123,6 @@
@@ -206,9 +204,9 @@
@@ -249,12 +247,12 @@
BasedOn="{StaticResource {x:Type RepeatButton}}"
TargetType="RepeatButton">
diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml
index af43caff..1af8a6b2 100644
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -2,6 +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/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml
index 98e76d7a..027b5809 100644
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -224,7 +224,6 @@
@@ -307,7 +306,7 @@
diff --git a/src/Semi.Avalonia/Controls/SplitView.axaml b/src/Semi.Avalonia/Controls/SplitView.axaml
index f940c672..852ffc20 100644
--- a/src/Semi.Avalonia/Controls/SplitView.axaml
+++ b/src/Semi.Avalonia/Controls/SplitView.axaml
@@ -1,4 +1,6 @@
+
+
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index a408fd36..bd514f16 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -2,6 +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/TabStrip.axaml b/src/Semi.Avalonia/Controls/TabStrip.axaml
index 23ea2980..fa5a9d14 100644
--- a/src/Semi.Avalonia/Controls/TabStrip.axaml
+++ b/src/Semi.Avalonia/Controls/TabStrip.axaml
@@ -2,6 +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/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 2c4314bb..30b425c5 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -24,25 +24,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
@@ -139,12 +138,9 @@
-
+
+
+
+
+
-
-
+
+
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
index 514af342..8d133279 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -52,7 +52,6 @@
+
+
Date: Wed, 6 Nov 2024 16:35:53 +0800
Subject: [PATCH 09/42] misc: clean prefix Control.
(cherry picked from commit fd68cad375cb0f317dd71e85193b3268876b1b71)
---
src/Semi.Avalonia/Controls/Border.axaml | 12 ++--
src/Semi.Avalonia/Controls/Carousel.axaml | 24 +++----
src/Semi.Avalonia/Controls/ContextMenu.axaml | 22 +++----
.../Controls/DateTimePickerShared.axaml | 2 +-
.../Controls/FlyoutPresenter.axaml | 66 +++++++++----------
src/Semi.Avalonia/Controls/Label.axaml | 22 +++----
.../Controls/ManagedFileChooser.axaml | 2 +-
.../Controls/MenuFlyoutPresenter.axaml | 18 ++---
.../Controls/NumericUpDown.axaml | 10 +--
src/Semi.Avalonia/Controls/PathIcon.axaml | 6 +-
.../Controls/SelectableTextBlock.axaml | 10 +--
src/Semi.Avalonia/Controls/Slider.axaml | 10 +--
src/Semi.Avalonia/Controls/TabItem.axaml | 14 ++--
src/Semi.Avalonia/Controls/TabStrip.axaml | 14 ++--
src/Semi.Avalonia/Controls/TextBlock.axaml | 2 +-
src/Semi.Avalonia/Controls/TextBox.axaml | 6 +-
src/Semi.Avalonia/Controls/TreeView.axaml | 2 +-
17 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/Border.axaml b/src/Semi.Avalonia/Controls/Border.axaml
index 53806cfb..9967017a 100644
--- a/src/Semi.Avalonia/Controls/Border.axaml
+++ b/src/Semi.Avalonia/Controls/Border.axaml
@@ -17,12 +17,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml
index d6beab9b..57120731 100644
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -26,9 +26,9 @@
-
-
-
+
+
+
@@ -56,9 +56,9 @@
-
-
-
+
+
+
@@ -84,9 +84,9 @@
-
-
-
+
+
+
@@ -122,9 +122,9 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
index 18d96638..22e5c05b 100644
--- a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
@@ -3,24 +3,24 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
+
@@ -164,14 +164,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
M6,2H18A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2M12,4A6,6 0 0,0 6,10C6,13.31 8.69,16 12.1,16L11.22,13.77C10.95,13.29 11.11,12.68 11.59,12.4L12.45,11.9C12.93,11.63 13.54,11.79 13.82,12.27L15.74,14.69C17.12,13.59 18,11.9 18,10A6,6 0 0,0 12,4M12,9A1,1 0 0,1 13,10A1,1 0 0,1 12,11A1,1 0 0,1 11,10A1,1 0 0,1 12,9M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M12.09,13.27L14.58,19.58L17.17,18.08L12.95,12.77L12.09,13.27Z
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
diff --git a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
index f37905ae..5e9572b6 100644
--- a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
@@ -13,11 +13,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Controls/Slider.axaml b/src/Semi.Avalonia/Controls/Slider.axaml
index 1af8a6b2..6eb16dc3 100644
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -44,11 +44,11 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 30b425c5..3370c2f3 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -511,9 +511,9 @@
-
-
-
+
+
+
diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml
index 658ad7b0..b404ba89 100644
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -59,7 +59,7 @@
Left="True" />
-
+
Date: Thu, 7 Nov 2024 17:56:29 +0800
Subject: [PATCH 10/42] misc: replace x:Name to Name.
(cherry picked from commit 0858f01fecdb04b0b0a2091f82229b41cc159480)
---
.../Pages/DataGridDemo.axaml | 6 +--
.../Controls/ColorPicker.axaml | 50 ++++++++---------
.../Controls/ColorPreviewer.axaml | 8 +--
.../Controls/ColorSpectrum.axaml | 24 ++++-----
.../Controls/ColorView.axaml | 54 +++++++++----------
src/Semi.Avalonia.DataGrid/DataGrid.axaml | 38 ++++++-------
.../TreeDataGrid.axaml | 14 ++---
src/Semi.Avalonia/Controls/Button.axaml | 2 +-
.../Controls/ButtonSpinner.axaml | 2 +-
.../Controls/CalendarDatePicker.axaml | 4 +-
.../Controls/CaptionButtons.axaml | 8 +--
src/Semi.Avalonia/Controls/CheckBox.axaml | 24 ++++-----
src/Semi.Avalonia/Controls/ComboBox.axaml | 12 ++---
.../Controls/DataValidationErrors.axaml | 2 +-
src/Semi.Avalonia/Controls/DatePicker.axaml | 4 +-
.../Controls/DateTimePickerShared.axaml | 2 +-
.../Controls/DropDownButton.axaml | 8 +--
src/Semi.Avalonia/Controls/Expander.axaml | 8 +--
.../Controls/HyperlinkButton.axaml | 8 +--
src/Semi.Avalonia/Controls/ListBox.axaml | 18 +++----
.../Controls/ManagedFileChooser.axaml | 8 +--
src/Semi.Avalonia/Controls/Menu.axaml | 2 +-
.../Controls/NotificationCard.axaml | 2 +-
src/Semi.Avalonia/Controls/ProgressBar.axaml | 14 ++---
src/Semi.Avalonia/Controls/RadioButton.axaml | 20 +++----
src/Semi.Avalonia/Controls/RepeatButton.axaml | 2 +-
src/Semi.Avalonia/Controls/Slider.axaml | 4 +-
src/Semi.Avalonia/Controls/SplitButton.axaml | 8 +--
src/Semi.Avalonia/Controls/SplitView.axaml | 8 +--
src/Semi.Avalonia/Controls/TimePicker.axaml | 16 +++---
src/Semi.Avalonia/Controls/TitleBar.axaml | 8 +--
src/Semi.Avalonia/Controls/ToggleButton.axaml | 2 +-
src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 38 ++++++-------
33 files changed, 213 insertions(+), 215 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
index d2c8add7..475c6af5 100644
--- a/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/DataGridDemo.axaml
@@ -101,7 +101,7 @@
-
+
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
index 8d133279..31cc5708 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml
@@ -81,7 +81,7 @@
-
+
@@ -75,7 +75,7 @@
Foreground="{TemplateBinding Foreground}" />
@@ -204,7 +204,7 @@
TargetType="DataGridColumnHeader">
-
+
@@ -420,7 +420,7 @@
-
+
-
@@ -343,7 +343,7 @@
-
+
-
+
-
+
+ Name="IconGrid">
+ Name="BackgroundRectangle" />
+ Name="ContentPresenter" />
diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml
index 34439eca..7221f712 100644
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -295,7 +295,7 @@
-
+
@@ -50,7 +50,7 @@
@@ -64,7 +64,7 @@
Data="{DynamicResource ManagedFileChooserUpButtonGlyph}"
Foreground="{DynamicResource ManagedFileChooserIconForeground}" />
-
+
@@ -89,7 +89,7 @@
DockPanel.Dock="Left"
IsChecked="{Binding ShowHiddenFiles}" />
-
+
-
+
@@ -145,7 +145,7 @@
@@ -154,7 +154,7 @@
diff --git a/src/Semi.Avalonia/Controls/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml
index 027b5809..c412797d 100644
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -25,7 +25,7 @@
-
-
@@ -264,12 +256,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -293,30 +285,25 @@
@@ -329,11 +316,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -351,29 +338,29 @@
+ Margin="{DynamicResource RadioButtonIconMargin}">
@@ -498,11 +471,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -523,40 +496,32 @@
TextWrapping="Wrap" />
-
+
@@ -574,11 +539,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -595,23 +560,23 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+ Width="{DynamicResource CheckBoxBoxGlyphWidth}"
+ Height="{DynamicResource CheckBoxBoxGlyphHeight}"
+ Foreground="{DynamicResource CheckBoxGlyphFill}" />
@@ -752,11 +713,11 @@
-
+
-
+
-
+
@@ -774,27 +735,27 @@
+ Margin="{DynamicResource CheckBoxBoxMargin}">
+ Width="{DynamicResource CheckBoxBoxGlyphWidth}"
+ Height="{DynamicResource CheckBoxBoxGlyphHeight}"
+ Foreground="{DynamicResource CheckBoxGlyphFill}" />
-
diff --git a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
index 01b9e960..e1f4603c 100644
--- a/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ListBox.axaml
@@ -9,86 +9,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ListBox.axaml b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
index 43055904..00b3b980 100644
--- a/src/Semi.Avalonia/Themes/Light/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ListBox.axaml
@@ -9,86 +9,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
index edff4078..a4028046 100644
--- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
@@ -3,47 +3,4 @@
8 4
3
-
- 16
- 6
- 14
- 0 2 0 0
- 8 0 0 0
- 3
-
-
- 3
-
- 600
- 16 2
- 16 4
- 24 6
-
- 12
- 12
- 14
-
-
- 16 12
- 3
-
-
- 14
- 16
- 16
- 10
- 10
-
- 3
- 1
- 0 2 0 0
- 8 0 0 0
-
- M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z
- M5 12.5C5 11.6716 5.67157 11 6.5 11H17.5C18.3284 11 19 11.6716 19 12.5C19 13.3284 18.3284 14 17.5 14H6.5C5.67157 14 5 13.3284 5 12.5Z
-
-
- 1
- 16 12
- 3
\ No newline at end of file
From ab3d88a6d13cec611c53650ae7ee91cd68611dd1 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 8 Nov 2024 05:12:52 +0800
Subject: [PATCH 13/42] feat: design an AdornerLayer for Solid Button.
(cherry picked from commit 1250d45ad8b9b550047c70d9f6291be95769ae75)
---
src/Semi.Avalonia/Controls/AdornerLayer.axaml | 12 +++-
src/Semi.Avalonia/Controls/Button.axaml | 6 ++
.../Controls/DropDownButton.axaml | 6 ++
src/Semi.Avalonia/Controls/RepeatButton.axaml | 6 ++
src/Semi.Avalonia/Controls/SplitButton.axaml | 62 +++++++++++--------
src/Semi.Avalonia/Controls/ToggleButton.axaml | 6 ++
src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 20 +++---
.../Themes/Dark/AdornerLayer.axaml | 3 +-
.../Themes/Dark/ToggleButton.axaml | 14 ++---
.../Themes/Light/AdornerLayer.axaml | 3 +-
.../Themes/Light/ToggleButton.axaml | 2 +-
.../Themes/Shared/AdornerLayer.axaml | 1 +
.../Themes/Shared/ToggleSwitch.axaml | 1 +
13 files changed, 94 insertions(+), 48 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/AdornerLayer.axaml b/src/Semi.Avalonia/Controls/AdornerLayer.axaml
index 03a76948..9162d85f 100644
--- a/src/Semi.Avalonia/Controls/AdornerLayer.axaml
+++ b/src/Semi.Avalonia/Controls/AdornerLayer.axaml
@@ -5,9 +5,17 @@
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/Button.axaml b/src/Semi.Avalonia/Controls/Button.axaml
index e32ea293..190bf226 100644
--- a/src/Semi.Avalonia/Controls/Button.axaml
+++ b/src/Semi.Avalonia/Controls/Button.axaml
@@ -102,6 +102,12 @@
x:Key="SolidButton"
BasedOn="{StaticResource {x:Type Button}}"
TargetType="Button">
+
+
+
+
+
-
+
-
-
-
+
-
+
-
-
+
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
index d0761c08..82f02600 100644
--- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
index 08ee311f..c7356e70 100644
--- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
index 1119ef0e..91872103 100644
--- a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
@@ -1,9 +1,9 @@
14
- 12
- 12
- 12
- 12
+ 600
+ 14
+ 14
+ 0 0 4 0
M 12.9393 2.9393 C 15.182 0.69666 18.818 0.696668 21.0606 2.93931 C 23.3033 5.18195 23.3033 8.81799 21.0606 11.0606 L 18.3925 13.7288 C 18.4631 13.3298 18.5 12.9192 18.5 12.5 C 18.5 11.5751 18.3206 10.6921 17.9947 9.88386 L 18.9393 8.93931 C 20.0104 7.86824 20.0104 6.13169 18.9393 5.06063 C 17.8682 3.98956 16.1317 3.98956 15.0606 5.06062 L 11.0606 9.06063 C 9.98956 10.1317 9.98956 11.8682 11.0606 12.9393 C 11.3265 13.2052 11.6335 13.4051 11.961 13.539 L 9.75848 15.7415 C 9.47 15.5439 9.19556 15.3169 8.9393 15.0606 C 6.69666 12.818 6.69666 9.18195 8.9393 6.93931 L 12.9393 2.9393 Z M 2.9393 12.9393 L 5.60751 10.2711 C 5.53685 10.6701 5.49999 11.0808 5.49999 11.5001 C 5.49999 12.4249 5.67935 13.3079 6.00519 14.1161 L 5.06062 15.0607 C 3.98956 16.1317 3.98956 17.8683 5.06063 18.9393 C 6.13169 20.0104 7.86824 20.0104 8.9393 18.9393 L 12.9393 14.9393 C 14.0104 13.8683 14.0104 12.1317 12.9393 11.0607 C 12.7664 10.8878 12.5762 10.7428 12.3743 10.6258 L 14.5302 8.46985 C 14.7141 8.61357 14.8914 8.77007 15.0606 8.93934 C 17.3033 11.182 17.3033 14.818 15.0606 17.0607 L 11.0606 21.0607 C 8.81798 23.3033 5.18194 23.3033 2.9393 21.0607 C 0.696665 18.818 0.696663 15.182 2.9393 12.9393 Z
-
+
\ No newline at end of file
From 4da246704791769c8529224c748324a673962899 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sat, 9 Nov 2024 04:13:00 +0800
Subject: [PATCH 15/42] feat: redesign GroupBox theme for
HeaderedContentControl.
Header & Content are now invisible when set to null.
SeparatorBorder is now influenced by BorderThickness.
Background is no longer transparent.
(cherry picked from commit 021ca978659bbb83fac8e4fb719473237f8a6b62)
---
.../Pages/HeaderedContentControlDemo.axaml | 18 ++--
demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml | 80 +++++++++---------
.../Pages/SelectableTextBlock.axaml | 83 +++++++++---------
.../Pages/TextBlockDemo.axaml | 75 ++++++++---------
.../Controls/HeaderedContentControl.axaml | 84 ++++++++++++-------
.../Themes/Dark/HeaderedContentControl.axaml | 4 +-
.../Themes/Light/HeaderedContentControl.axaml | 4 +-
.../Shared/HeaderedContentControl.axaml | 6 +-
8 files changed, 197 insertions(+), 157 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
index af62a806..b778b13a 100644
--- a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1450"
x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo">
@@ -27,12 +27,18 @@
GroupBox Theme
- Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。
+ HorizontalAlignment="Left"
+ MaxWidth="360">
+
+
+
+
+
+
+
+
+
diff --git a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
index 5b172502..250c7946 100644
--- a/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
@@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- d:DesignHeight="450"
+ d:DesignHeight="800"
d:DesignWidth="800"
mc:Ignorable="d">
@@ -13,15 +13,13 @@
+
-
-
-
- Classes
- -
- Secondary
- Tertiary
- Quaternary
- Success
- Warning
- Danger
- Mark
- Code
-
+ RowDefinitions="*,*,*,*,*,*,*,*,*,*,*">
+ Classes
+ -
+ Secondary
+ Tertiary
+ Quaternary
+ Success
+ Warning
+ Danger
+ Mark
+ Code
+
diff --git a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
index e70aeeed..19dad7ce 100644
--- a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml
@@ -1,7 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -12,31 +36,31 @@
CornerRadius="{TemplateBinding CornerRadius}"
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}">
-
+
+ FontStyle="{TemplateBinding FontStyle}" />
+ FontStyle="{TemplateBinding FontStyle}" />
@@ -44,42 +68,46 @@
-
-
-
+
+
+
-
-
-
+ BorderThickness="{TemplateBinding BorderThickness}"
+ CornerRadius="{TemplateBinding CornerRadius}">
-
+
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness, Converter={StaticResource SeparatorBorderMultiplier}}">
+
+
+
+
+
+
+
+ TextWrapping="Wrap" />
diff --git a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
index c5804df3..56bc7922 100644
--- a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
index ce872524..501435be 100644
--- a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml
@@ -1,4 +1,4 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
index c6e24ac5..24289d53 100644
--- a/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml
@@ -1,3 +1,7 @@
- 4
+ 6
+ 1
+ 600
+ 20
+ 20
\ No newline at end of file
From d1c38db678b72cf67aa1ef0fdfbe4ffc7c3b9a1c Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Nov 2024 13:00:01 +0800
Subject: [PATCH 16/42] misc: Restore > to >.
(cherry picked from commit dfcb3579b45899db44d3f6d695f5e510a745be4a)
---
src/Semi.Avalonia/Controls/DatePicker.axaml | 2 +-
src/Semi.Avalonia/Controls/ScrollViewer.axaml | 10 +++++-----
src/Semi.Avalonia/Controls/TabControl.axaml | 4 ++--
src/Semi.Avalonia/Controls/TimePicker.axaml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 092d963d..845631e0 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -25,7 +25,7 @@
-
diff --git a/src/Semi.Avalonia/Controls/ScrollViewer.axaml b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
index e68d344c..431a776d 100644
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -205,13 +205,13 @@
-
-
-
@@ -346,11 +346,11 @@
-
-
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index bd514f16..b10af869 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -33,10 +33,10 @@
-
-
From ffbfe959f9da3c47129596ba20590f3e8eecff03 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:46:07 +0800
Subject: [PATCH 17/42] feat: adjust ComboBox, ListBox, DatePicker & TimePicker
item Padding.
(cherry picked from commit d3f297730b9a6f826ae110f8222776e08480657b)
---
src/Semi.Avalonia/Controls/ComboBox.axaml | 6 ++----
src/Semi.Avalonia/Controls/DatePicker.axaml | 5 ++++-
src/Semi.Avalonia/Controls/DateTimePickerShared.axaml | 4 ----
src/Semi.Avalonia/Controls/TimePicker.axaml | 4 +++-
src/Semi.Avalonia/Themes/Shared/ComboBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml | 4 ++--
src/Semi.Avalonia/Themes/Shared/ListBox.axaml | 2 +-
7 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 533ad172..f567b790 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -65,8 +65,7 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
TextTrimming="CharacterEllipsis"
Foreground="{TemplateBinding Foreground}"
- IsVisible="{TemplateBinding SelectionBoxItem,
- Converter={x:Static ObjectConverters.IsNull}}"
+ IsVisible="{TemplateBinding SelectionBoxItem,Converter={x:Static ObjectConverters.IsNull}}"
Opacity="0.3"
Text="{TemplateBinding PlaceholderText}" />
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index 845631e0..cae06c40 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -21,7 +21,8 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
- CornerRadius="{TemplateBinding CornerRadius}">
+ CornerRadius="{TemplateBinding CornerRadius}"
+ ClipToBounds="True">
@@ -107,6 +108,7 @@
Data="{DynamicResource DateTimePickerDismissGlyph}" />
-
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index edd9b553..e5f013d4 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -20,7 +20,8 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
- CornerRadius="{TemplateBinding CornerRadius}">
+ CornerRadius="{TemplateBinding CornerRadius}"
+ ClipToBounds="True">
@@ -109,6 +110,7 @@
Data="{DynamicResource DateTimePickerDismissGlyph}" />
3
- 8 4
+ 12 8
8 0
1
diff --git a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
index 532a50cd..80c132d6 100644
--- a/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
@@ -4,10 +4,10 @@
M17.4111 7.30848C18.0692 7.81171 18.1947 8.75312 17.6915 9.41119L11.1915 17.9112C10.909 18.2806 10.4711 18.4981 10.0061 18.5C9.54105 18.5019 9.10143 18.288 8.81592 17.9209L5.31592 13.4209C4.80731 12.767 4.92512 11.8246 5.57904 11.316C6.23296 10.8074 7.17537 10.9252 7.68398 11.5791L9.98988 14.5438L15.3084 7.58884C15.8116 6.93077 16.7531 6.80525 17.4111 7.30848Z
M17.6568 19.7782C18.2426 20.3639 19.1924 20.3639 19.7782 19.7782C20.3639 19.1924 20.3639 18.2426 19.7782 17.6568L14.1213 12L19.7782 6.34313C20.3639 5.75734 20.3639 4.8076 19.7782 4.22181C19.1924 3.63602 18.2426 3.63602 17.6568 4.22181L12 9.87866L6.34313 4.22181C5.75734 3.63602 4.8076 3.63602 4.22181 4.22181C3.63602 4.8076 3.63602 5.75734 4.22181 6.34313L9.87866 12L4.22181 17.6568C3.63602 18.2426 3.63602 19.1924 4.22181 19.7782C4.8076 20.3639 5.75734 20.3639 6.34313 19.7782L12 14.1213L17.6568 19.7782Z
- 30
+ 36
- 16 0
+ 0
8
24
diff --git a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
index a4028046..371349fd 100644
--- a/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ListBox.axaml
@@ -1,6 +1,6 @@
- 8 4
+ 12 8
3
\ No newline at end of file
From 590d14117d95de5c6304fdc87ad1ef20f8c13bba Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:10:35 +0800
Subject: [PATCH 18/42] feat: extract ComboBox resources.
(cherry picked from commit 3ce4067c3f2e7165c63391f240e38e906412c237)
---
src/Semi.Avalonia/Controls/ComboBox.axaml | 26 +++++++------------
.../Themes/Shared/ComboBox.axaml | 8 ++++++
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index f567b790..7b7ff5e8 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -30,10 +30,10 @@
-
+
-
+
@@ -79,27 +79,19 @@
-
+ CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}"
+ ClipToBounds="True">
3
+ 1
12 8
8 0
+ 504
1
+ 6
+ 0 0 8 0
+ 0 0 12 0
+ 12
+ 12
M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
+ 0 4
32
24
From 26549f09a980401b8a8079da848897cd32901674 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 13 Nov 2024 01:14:34 +0800
Subject: [PATCH 19/42] feat: extract CommunityToolkit version.
(cherry picked from commit 580e780e58eed32c4917d5688fbde2e8316d8d6a)
---
demo/Directory.Build.props | 1 +
demo/Semi.Avalonia.Demo.Desktop/Program.cs | 6 +++---
demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj | 2 +-
demo/Semi.Avalonia.TreeDataGrid.Demo/Program.cs | 12 +++++++++++-
.../Semi.Avalonia.TreeDataGrid.Demo.csproj | 11 +++++------
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
index e25d59ce..2d2f46e3 100644
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -2,5 +2,6 @@
enable
11.1.3
+ 8.3.2
diff --git a/demo/Semi.Avalonia.Demo.Desktop/Program.cs b/demo/Semi.Avalonia.Demo.Desktop/Program.cs
index e011c455..f6fb44db 100644
--- a/demo/Semi.Avalonia.Demo.Desktop/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Desktop/Program.cs
@@ -16,13 +16,13 @@ class Program
public static void Main(string[] args) => BuildAvaloniaApp()
.With(new FontManagerOptions
{
- FontFallbacks = new[]
- {
+ FontFallbacks =
+ [
new FontFallback
{
FontFamily = new FontFamily("Microsoft YaHei")
}
- }
+ ]
})
.StartWithClassicDesktopLifetime(args);
diff --git a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
index cb9a6797..9e5c54a0 100644
--- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
+++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/Program.cs b/demo/Semi.Avalonia.TreeDataGrid.Demo/Program.cs
index b71cf5e5..b0b60d90 100644
--- a/demo/Semi.Avalonia.TreeDataGrid.Demo/Program.cs
+++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/Program.cs
@@ -1,5 +1,6 @@
using Avalonia;
using System;
+using Avalonia.Media;
namespace Semi.Avalonia.TreeDataGrid.Demo;
@@ -10,12 +11,21 @@ class Program
// yet and stuff might break.
[STAThread]
public static void Main(string[] args) => BuildAvaloniaApp()
+ .With(new FontManagerOptions
+ {
+ FontFallbacks =
+ [
+ new FontFallback
+ {
+ FontFamily = new FontFamily("Microsoft YaHei")
+ }
+ ]
+ })
.StartWithClassicDesktopLifetime(args);
// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure()
.UsePlatformDetect()
- .WithInterFont()
.LogToTrace();
}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj b/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
index 59312afa..39c2617f 100644
--- a/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
+++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
@@ -4,25 +4,24 @@
net6.0
enable
true
+ latest
app.manifest
true
-
+
-
-
-
+
-
-
+
+
From cd2c4bdda073afe6e25aec39e5b0e79b789bd4c3 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 13 Nov 2024 01:23:58 +0800
Subject: [PATCH 20/42] feat: resolve AOT issue.
(cherry picked from commit 2437df392b89914093bff2de99b8a5bcd34f0204)
---
.../Semi.Avalonia.TreeDataGrid.Demo.csproj | 6 ++++--
src/Semi.Avalonia.TreeDataGrid/Index.axaml | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj b/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
index 39c2617f..9327faec 100644
--- a/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
+++ b/demo/Semi.Avalonia.TreeDataGrid.Demo/Semi.Avalonia.TreeDataGrid.Demo.csproj
@@ -1,12 +1,15 @@
WinExe
- net6.0
+ net8.0
enable
true
latest
app.manifest
true
+
+
+
@@ -19,7 +22,6 @@
-
diff --git a/src/Semi.Avalonia.TreeDataGrid/Index.axaml b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
index b557af17..9fd70b02 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
@@ -3,8 +3,8 @@
-
-
+
+
From 45b33bb9fdb2587e16c927675717b7358a4c28e8 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sat, 9 Nov 2024 05:29:31 +0800
Subject: [PATCH 21/42] feat: add basic BoxShadows.
(cherry picked from commit a4ee27778ec777c4c592eb951482b1a227218349)
---
src/Semi.Avalonia/Themes/Dark/Palette.axaml | 4 ++++
src/Semi.Avalonia/Themes/Light/Palette.axaml | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
index e69e146e..9fa87323 100644
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
@@ -421,4 +421,8 @@
+
+
+ 0 0 0 0 #0A000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml
index 9e006f93..9be8e8f2 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -421,4 +421,8 @@
+
+
+ 0 0 0 0 #0A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
\ No newline at end of file
From b23f79fc3961ead0da80480e4686e5f715fd5c14 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 13 Nov 2024 16:42:25 +0800
Subject: [PATCH 22/42] fix: fix BoxShadows.
(cherry picked from commit 46b1c5d1cc8f741c36955edb1da2dd4036521916)
---
src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 4 ++--
src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Border.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Flyout.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Menu.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml | 2 ++
src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Border.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/ComboBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Flyout.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Menu.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml | 2 ++
17 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index 65255d54..96a3da49 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -74,7 +74,7 @@
- 0 0 8 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
index 4d617296..d36d0ac1 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,5 +1,5 @@
- 0 0 14 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 817c7e1c..5c50c6d0 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
- 0 0 8 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 5d8a707a..82bb56d1 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -17,7 +17,7 @@
- 0 0 8 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 8a9b1a9b..4f941075 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -24,5 +24,5 @@
- 0 0 8 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index 6e2a1fb0..0d865df1 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -2,5 +2,5 @@
- 0 0 8 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index 67fb339d..c4556002 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -5,7 +5,7 @@
- 0 0 8 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index f5d68883..5a4c5e52 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -13,4 +13,6 @@
+
+ 0 4 6 0 #1A000000, 0 0 1 0 #4D000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index 7fb12107..520f9b5f 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
- 0 0 8 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index eb19ed29..be23f5cc 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,5 +1,5 @@
- 0 0 14 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 19a5b839..7aad8146 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
- 0 0 8 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 8fc128f0..1b2e15de 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -16,7 +16,7 @@
- 0 0 8 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 8a6df07a..982ecf0f 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -26,5 +26,5 @@
- 0 0 8 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
index 7e7d9fdd..aac33f59 100644
--- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -2,5 +2,5 @@
- 0 0 8 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index 3ec9c1a9..a90c874d 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -5,7 +5,7 @@
- 0 0 8 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index b86d9b15..0f7dbe85 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -13,4 +13,6 @@
+
+ 0 4 6 0 #1A000000, 0 0 1 0 #4D000000
\ No newline at end of file
From c87f6a811276b9c8eb18f8558f21da472189173c Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 14 Nov 2024 18:07:34 +0800
Subject: [PATCH 23/42] fix: fix popup BoxShadow and unclosed corner issues.
(cherry picked from commit 3a31924c6b454ae59571690259f00a6586420b29)
---
src/Semi.Avalonia.ColorPicker/Dark.axaml | 2 +-
src/Semi.Avalonia.ColorPicker/Light.axaml | 2 +-
.../Controls/AutoCompleteBox.axaml | 32 +--
src/Semi.Avalonia/Controls/ComboBox.axaml | 23 ++-
src/Semi.Avalonia/Controls/DatePicker.axaml | 191 +++++++++---------
.../Controls/MenuFlyoutPresenter.axaml | 1 -
src/Semi.Avalonia/Controls/TimePicker.axaml | 119 ++++++-----
.../Themes/Shared/ComboBox.axaml | 2 +-
8 files changed, 199 insertions(+), 173 deletions(-)
diff --git a/src/Semi.Avalonia.ColorPicker/Dark.axaml b/src/Semi.Avalonia.ColorPicker/Dark.axaml
index e96849e1..7ba3a79b 100644
--- a/src/Semi.Avalonia.ColorPicker/Dark.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Dark.axaml
@@ -17,5 +17,5 @@
- 0 0 14 0 #1AFFFFFF
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/Light.axaml b/src/Semi.Avalonia.ColorPicker/Light.axaml
index 6148e2f0..946f7076 100644
--- a/src/Semi.Avalonia.ColorPicker/Light.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Light.axaml
@@ -17,5 +17,5 @@
- 0 0 14 0 #1A000000
+ 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
index d3e18efa..1687af03 100644
--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -39,12 +39,16 @@
BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-
+
+
+
@@ -77,12 +81,16 @@
BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-
+
+
+
diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml
index 7b7ff5e8..c5f39b58 100644
--- a/src/Semi.Avalonia/Controls/ComboBox.axaml
+++ b/src/Semi.Avalonia/Controls/ComboBox.axaml
@@ -117,16 +117,19 @@
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
- CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}"
- ClipToBounds="True">
-
-
-
+ CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}">
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index cae06c40..70107423 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -21,100 +21,107 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
- CornerRadius="{TemplateBinding CornerRadius}"
- ClipToBounds="True">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ CornerRadius="{TemplateBinding CornerRadius}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
index 91f9651f..a51e3c66 100644
--- a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
@@ -37,7 +37,6 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
- ClipToBounds="True"
CornerRadius="{TemplateBinding CornerRadius}"
UseLayoutRounding="False">
+
+
@@ -20,27 +22,29 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource DateTimePickerFlyoutBoxShadow}"
- CornerRadius="{TemplateBinding CornerRadius}"
- ClipToBounds="True">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ CornerRadius="{TemplateBinding CornerRadius}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,41 +86,46 @@
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
index 2930b5f6..512f24ad 100644
--- a/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
@@ -16,7 +16,7 @@
M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
- 0 4
+ 4
32
24
From ebdb0b1b93142e6fa97c97c63b3cb21ebcfe04f4 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:00:59 +0800
Subject: [PATCH 24/42] misc: format codes.
(cherry picked from commit d1d235a1200b589b3dec7e1cf2c7adbf465adc85)
---
.../Controls/FunctionalColorGroupControl.cs | 27 ++-
.../ViewModels/PaletteDemoViewModel.cs | 218 +++++++++---------
2 files changed, 129 insertions(+), 116 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
index 7a17deed..57b35877 100644
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs
@@ -4,33 +4,38 @@
namespace Semi.Avalonia.Demo.Controls;
-public class FunctionalColorGroupControl: TemplatedControl
+public class FunctionalColorGroupControl : TemplatedControl
{
- public static readonly StyledProperty TitleProperty = AvaloniaProperty.Register(
- nameof(Title));
+ public static readonly StyledProperty TitleProperty =
+ AvaloniaProperty.Register(nameof(Title));
+
public string? Title
{
get => GetValue(TitleProperty);
set => SetValue(TitleProperty, value);
}
-
- public static readonly DirectProperty LightColorsProperty = AvaloniaProperty.RegisterDirect(
- nameof(LightColors), o => o.LightColors, (o, v) => o.LightColors = v);
+
+ public static readonly DirectProperty LightColorsProperty =
+ AvaloniaProperty.RegisterDirect(nameof(LightColors),
+ o => o.LightColors, (o, v) => o.LightColors = v);
+
private IEnumerable? _lightColors;
+
public IEnumerable? LightColors
{
get => _lightColors;
set => SetAndRaise(LightColorsProperty, ref _lightColors, value);
}
-
- public static readonly DirectProperty DarkColorsProperty = AvaloniaProperty.RegisterDirect(
- nameof(DarkColors), o => o.DarkColors, (o, v) => o.DarkColors = v);
+
+ public static readonly DirectProperty DarkColorsProperty =
+ AvaloniaProperty.RegisterDirect(nameof(DarkColors),
+ o => o.DarkColors, (o, v) => o.DarkColors = v);
+
private IEnumerable? _darkColors;
+
public IEnumerable? DarkColors
{
get => _darkColors;
set => SetAndRaise(DarkColorsProperty, ref _darkColors, value);
}
-
-
}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
index 1646be86..4a53cb75 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
@@ -2,25 +2,25 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
using Avalonia.Media;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Messaging;
namespace Semi.Avalonia.Demo.ViewModels;
-public class PaletteDemoViewModel: ObservableObject
+public class PaletteDemoViewModel : ObservableObject
{
private readonly string[] _predefinedColorNames =
- {
+ [
"Red", "Pink", "Purple", "Violet", "Indigo",
"Blue", "LightBlue", "Cyan", "Teal", "Green",
"LightGreen", "Lime", "Yellow", "Amber", "Orange",
"Grey"
- };
+ ];
+
private readonly IResourceDictionary? _lightResourceDictionary;
private readonly IResourceDictionary? _darkResourceDictionary;
-
+
private ColorItemViewModel _selectedColor = null!;
public ColorItemViewModel SelectedColor
@@ -28,26 +28,29 @@ public ColorItemViewModel SelectedColor
get => _selectedColor;
set => SetProperty(ref _selectedColor, value);
}
-
-
+
+
private ObservableCollection? _lightLists;
+
public ObservableCollection? LightLists
{
get => _lightLists;
set => SetProperty(ref _lightLists, value);
}
+
private ObservableCollection? _darkLists;
+
public ObservableCollection? DarkLists
{
get => _darkLists;
set => SetProperty(ref _darkLists, value);
}
- public ObservableCollection FunctionalColors { get; set; } = new();
+ public ObservableCollection FunctionalColors { get; set; } = [];
public PaletteDemoViewModel()
{
- _lightResourceDictionary = new Light.Palette();
+ _lightResourceDictionary = new Light.Palette();
_darkResourceDictionary = new Dark.Palette();
WeakReferenceMessenger.Default.Register(this, OnClickColorItem);
}
@@ -60,14 +63,15 @@ public void InitializeResources()
private void InitializePalette()
{
- LightLists = new ObservableCollection();
+ LightLists = [];
foreach (var color in _predefinedColorNames)
{
ColorListViewModel s = new ColorListViewModel();
s.Initialize(_lightResourceDictionary, color, true);
LightLists.Add(s);
}
- DarkLists = new ObservableCollection();
+
+ DarkLists = [];
foreach (var color in _predefinedColorNames)
{
ColorListViewModel s = new ColorListViewModel();
@@ -92,13 +96,14 @@ private void InitializeFunctionalColors()
FunctionalColors.Add(new FunctionalColorGroupViewModel("Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens));
FunctionalColors.Add(new FunctionalColorGroupViewModel("Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens));
}
+
private void OnClickColorItem(PaletteDemoViewModel vm, ColorItemViewModel item)
{
SelectedColor = item;
}
}
-public class ColorListViewModel: ObservableObject
+public class ColorListViewModel : ObservableObject
{
private ObservableCollection? _colors;
@@ -115,17 +120,18 @@ public string? SeriesName
get => _seriesName;
set => SetProperty(ref _seriesName, value);
}
-
+
internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light)
{
if (resourceDictionary is null)
{
return;
}
+
SeriesName = color;
- Color = new ObservableCollection();
-
- for (int i = 0; i < 10; i++)
+ Color = [];
+
+ for (var i = 0; i < 10; i++)
{
var key = "Semi" + color + i;
if (resourceDictionary.TryGetValue(key, out var value))
@@ -136,7 +142,7 @@ internal void Initialize(IResourceDictionary? resourceDictionary, string color,
var item = new ColorItemViewModel(name, brush, key, light, i);
item.ColorResourceKey = item.ResourceKey + "Color";
Color.Add(item);
- }
+ }
}
}
}
@@ -144,15 +150,16 @@ internal void Initialize(IResourceDictionary? resourceDictionary, string color,
public class ColorItemViewModel : ObservableObject
{
-
private IBrush _brush = null!;
+
public IBrush Brush
{
get => _brush;
set => SetProperty(ref _brush, value);
}
-
+
private IBrush _textBrush = null!;
+
public IBrush TextBrush
{
get => _textBrush;
@@ -160,6 +167,7 @@ public IBrush TextBrush
}
private string _colorDisplayName = null!;
+
public string ColorDisplayName
{
get => _colorDisplayName;
@@ -189,8 +197,9 @@ public string Hex
get => _hex;
set => SetProperty(ref _hex, value);
}
-
- public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light, int index)
+
+ public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light,
+ int index)
{
ColorDisplayName = colorDisplayName;
Brush = brush;
@@ -210,22 +219,22 @@ public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, strin
public class FunctionalColorGroupViewModel : ObservableObject
{
private string _title = null!;
+
public string Title
{
get => _title;
set => SetProperty(ref _title, value);
}
- public ObservableCollection LightColors { get; set; } = new();
- public ObservableCollection DarkColors { get; set; } = new();
+ public ObservableCollection LightColors { get; set; } = [];
+ public ObservableCollection DarkColors { get; set; } = [];
- public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDictionary, IResourceDictionary? darkDictionary, IReadOnlyList> tokens)
+ public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDictionary,
+ IResourceDictionary? darkDictionary, IReadOnlyList> tokens)
{
Title = title;
- foreach (var token in tokens)
+ foreach (var (key, name) in tokens)
{
- string key = token.Item1;
- string name = token.Item2;
if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false)
{
if (lightValue is ISolidColorBrush lightBrush)
@@ -249,121 +258,120 @@ public static class ColorTokens
{
public static IReadOnlyList> PrimaryTokens { get; } = new List>
{
- new ("SemiColorPrimary", "Primary"),
- new ("SemiColorPrimaryPointerover", "Primary Pointerover"),
- new ("SemiColorPrimaryActive", "Primary Active"),
- new ("SemiColorPrimaryDisabled", "Primary Disabled"),
- new ("SemiColorPrimaryLight", "Primary Light"),
- new ("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
- new ("SemiColorPrimaryLightActive", "Primary Light Active"),
+ new("SemiColorPrimary", "Primary"),
+ new("SemiColorPrimaryPointerover", "Primary Pointerover"),
+ new("SemiColorPrimaryActive", "Primary Active"),
+ new("SemiColorPrimaryDisabled", "Primary Disabled"),
+ new("SemiColorPrimaryLight", "Primary Light"),
+ new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"),
+ new("SemiColorPrimaryLightActive", "Primary Light Active"),
};
public static IReadOnlyList> SecondaryTokens { get; } = new List>
{
- new ("SemiColorSecondary", "Secondary"),
- new ("SemiColorSecondaryPointerover", "Secondary Pointerover"),
- new ("SemiColorSecondaryActive", "Secondary Active"),
- new ("SemiColorSecondaryDisabled", "Secondary Disabled"),
- new ("SemiColorSecondaryLight", "Secondary Light"),
- new ("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
- new ("SemiColorSecondaryLightActive", "Secondary Light Active"),
+ new("SemiColorSecondary", "Secondary"),
+ new("SemiColorSecondaryPointerover", "Secondary Pointerover"),
+ new("SemiColorSecondaryActive", "Secondary Active"),
+ new("SemiColorSecondaryDisabled", "Secondary Disabled"),
+ new("SemiColorSecondaryLight", "Secondary Light"),
+ new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"),
+ new("SemiColorSecondaryLightActive", "Secondary Light Active"),
};
-
+
public static IReadOnlyList> TertiaryTokens { get; } = new List>
{
- new ("SemiColorTertiary", "Tertiary"),
- new ("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
- new ("SemiColorTertiaryActive", "Tertiary Active"),
- new ("SemiColorTertiaryLight", "Tertiary Light"),
- new ("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
- new ("SemiColorTertiaryLightActive", "Tertiary Light Active"),
+ new("SemiColorTertiary", "Tertiary"),
+ new("SemiColorTertiaryPointerover", "Tertiary Pointerover"),
+ new("SemiColorTertiaryActive", "Tertiary Active"),
+ new("SemiColorTertiaryLight", "Tertiary Light"),
+ new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"),
+ new("SemiColorTertiaryLightActive", "Tertiary Light Active"),
};
-
+
public static IReadOnlyList> InformationTokens { get; } = new List>
{
- new ("SemiColorInformation", "Information"),
- new ("SemiColorInformationPointerover", "Information Pointerover"),
- new ("SemiColorInformationActive", "Information Active"),
- new ("SemiColorInformationDisabled", "Information Disabled"),
- new ("SemiColorInformationLight", "Information Light"),
- new ("SemiColorInformationLightPointerover", "Information Light Pointerover"),
- new ("SemiColorInformationLightActive", "Information Light Active"),
+ new("SemiColorInformation", "Information"),
+ new("SemiColorInformationPointerover", "Information Pointerover"),
+ new("SemiColorInformationActive", "Information Active"),
+ new("SemiColorInformationDisabled", "Information Disabled"),
+ new("SemiColorInformationLight", "Information Light"),
+ new("SemiColorInformationLightPointerover", "Information Light Pointerover"),
+ new("SemiColorInformationLightActive", "Information Light Active"),
};
-
+
public static IReadOnlyList> SuccessTokens { get; } = new List>
{
- new ("SemiColorSuccess", "Success"),
- new ("SemiColorSuccessPointerover", "Success Pointerover"),
- new ("SemiColorSuccessActive", "Success Active"),
- new ("SemiColorSuccessDisabled", "Success Disabled"),
- new ("SemiColorSuccessLight", "Success Light"),
- new ("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
- new ("SemiColorSuccessLightActive", "Success Light Active"),
+ new("SemiColorSuccess", "Success"),
+ new("SemiColorSuccessPointerover", "Success Pointerover"),
+ new("SemiColorSuccessActive", "Success Active"),
+ new("SemiColorSuccessDisabled", "Success Disabled"),
+ new("SemiColorSuccessLight", "Success Light"),
+ new("SemiColorSuccessLightPointerover", "Success Light Pointerover"),
+ new("SemiColorSuccessLightActive", "Success Light Active"),
};
-
+
public static IReadOnlyList> WarningTokens { get; } = new List>
{
- new ("SemiColorWarning", "Warning"),
- new ("SemiColorWarningPointerover", "Warning Pointerover"),
- new ("SemiColorWarningActive", "Warning Active"),
- new ("SemiColorWarningLight", "Warning Light"),
- new ("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
- new ("SemiColorWarningLightActive", "Warning Light Active"),
+ new("SemiColorWarning", "Warning"),
+ new("SemiColorWarningPointerover", "Warning Pointerover"),
+ new("SemiColorWarningActive", "Warning Active"),
+ new("SemiColorWarningLight", "Warning Light"),
+ new("SemiColorWarningLightPointerover", "Warning Light Pointerover"),
+ new("SemiColorWarningLightActive", "Warning Light Active"),
};
-
+
public static IReadOnlyList> DangerTokens { get; } = new List>
{
- new ("SemiColorDanger", "Danger"),
- new ("SemiColorDangerPointerover", "Danger Pointerover"),
- new ("SemiColorDangerActive", "Danger Active"),
- new ("SemiColorDangerLight", "Danger Light"),
- new ("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
- new ("SemiColorDangerLightActive", "Danger Light Active"),
+ new("SemiColorDanger", "Danger"),
+ new("SemiColorDangerPointerover", "Danger Pointerover"),
+ new("SemiColorDangerActive", "Danger Active"),
+ new("SemiColorDangerLight", "Danger Light"),
+ new("SemiColorDangerLightPointerover", "Danger Light Pointerover"),
+ new("SemiColorDangerLightActive", "Danger Light Active"),
};
public static IReadOnlyList> TextTokens { get; } = new List>
{
- new ("SemiColorText0", "Text 0"),
- new ("SemiColorText1", "Text 1"),
- new ("SemiColorText2", "Text 2"),
- new ("SemiColorText3", "Text 3"),
+ new("SemiColorText0", "Text 0"),
+ new("SemiColorText1", "Text 1"),
+ new("SemiColorText2", "Text 2"),
+ new("SemiColorText3", "Text 3"),
};
-
+
public static IReadOnlyList> LinkTokens { get; } = new List>
{
- new ("SemiColorLink", "Link"),
- new ("SemiColorLinkPointerover", "Link Pointerover"),
- new ("SemiColorLinkActive", "Link Active"),
- new ("SemiColorLinkVisited", "Link Visited"),
+ new("SemiColorLink", "Link"),
+ new("SemiColorLinkPointerover", "Link Pointerover"),
+ new("SemiColorLinkActive", "Link Active"),
+ new("SemiColorLinkVisited", "Link Visited"),
};
-
+
public static IReadOnlyList> BackgroundTokens { get; } = new List>
{
- new ("SemiColorBackground0", "Background 0"),
- new ("SemiColorBackground1", "Background 1"),
- new ("SemiColorBackground2", "Background 2"),
- new ("SemiColorBackground3", "Background 3"),
- new ("SemiColorBackground4", "Background 4"),
+ new("SemiColorBackground0", "Background 0"),
+ new("SemiColorBackground1", "Background 1"),
+ new("SemiColorBackground2", "Background 2"),
+ new("SemiColorBackground3", "Background 3"),
+ new("SemiColorBackground4", "Background 4"),
};
-
+
public static IReadOnlyList> FillTokens { get; } = new List>
{
- new ("SemiColorFill0", "Fill 0"),
- new ("SemiColorFill1", "Fill 1"),
- new ("SemiColorFill2", "Fill 2"),
+ new("SemiColorFill0", "Fill 0"),
+ new("SemiColorFill1", "Fill 1"),
+ new("SemiColorFill2", "Fill 2"),
};
-
+
public static IReadOnlyList> BorderTokens { get; } = new List>
{
- new ("SemiColorBorder", "Border"),
+ new("SemiColorBorder", "Border"),
};
-
+
public static IReadOnlyList> DisabledTokens { get; } = new List>
{
- new ("SemiColorDisabledText", "Disabled Text"),
- new ("SemiColorDisabledBorder", "Disabled Border"),
- new ("SemiColorDisabledBackground", "Disabled Background"),
- new ("SemiColorDisabledFill", "Disabled Fill"),
+ new("SemiColorDisabledText", "Disabled Text"),
+ new("SemiColorDisabledBorder", "Disabled Border"),
+ new("SemiColorDisabledBackground", "Disabled Background"),
+ new("SemiColorDisabledFill", "Disabled Fill"),
};
-
}
\ No newline at end of file
From d03944000877ccccaf007fe55fb6e0531beea35d Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 15 Nov 2024 02:20:32 +0800
Subject: [PATCH 25/42] feat: add Shadow part to PaletteDemo.
(cherry picked from commit 8484d6ad868fd3a23cb695675e1c1da890a9d44f)
---
.../FunctionalColorGroupControl.axaml | 12 ++-
.../Controls/ShadowGroupControl.axaml | 88 +++++++++++++++++++
.../Controls/ShadowGroupControl.cs | 41 +++++++++
.../Pages/PaletteDemo.axaml | 16 +++-
.../ViewModels/PaletteDemoViewModel.cs | 86 ++++++++++++++++++
5 files changed, 234 insertions(+), 9 deletions(-)
create mode 100644 demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml
create mode 100644 demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs
diff --git a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
index a557a7bf..2c74653b 100644
--- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
+++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.axaml
@@ -5,18 +5,16 @@
xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"
x:CompileBindings="True"
x:DataType="viewModels:FunctionalColorGroupViewModel">
-
-
-
-
+
+
-
+ Theme="{DynamicResource TitleSelectableTextBlock}" />
@@ -131,4 +129,4 @@
-
+
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml b/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml
new file mode 100644
index 00000000..d06aea41
--- /dev/null
+++ b/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.axaml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs b/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs
new file mode 100644
index 00000000..bb59ab12
--- /dev/null
+++ b/demo/Semi.Avalonia.Demo/Controls/ShadowGroupControl.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using Avalonia;
+using Avalonia.Controls.Primitives;
+
+namespace Semi.Avalonia.Demo.Controls;
+
+public class ShadowGroupControl : TemplatedControl
+{
+ public static readonly StyledProperty TitleProperty =
+ AvaloniaProperty.Register(nameof(Title));
+
+ public string? Title
+ {
+ get => GetValue(TitleProperty);
+ set => SetValue(TitleProperty, value);
+ }
+
+ private IEnumerable? _lightShadows;
+
+ public static readonly DirectProperty LightShadowsProperty =
+ AvaloniaProperty.RegisterDirect(nameof(LightShadows),
+ o => o.LightShadows, (o, v) => o.LightShadows = v);
+
+ public IEnumerable? LightShadows
+ {
+ get => _lightShadows;
+ set => SetAndRaise(LightShadowsProperty, ref _lightShadows, value);
+ }
+
+ private IEnumerable? _darkShadows;
+
+ public static readonly DirectProperty DarkShadowsProperty =
+ AvaloniaProperty.RegisterDirect(nameof(DarkShadows),
+ o => o.DarkShadows, (o, v) => o.DarkShadows = v);
+
+ public IEnumerable? DarkShadows
+ {
+ get => _darkShadows;
+ set => SetAndRaise(DarkShadowsProperty, ref _darkShadows, value);
+ }
+}
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
index 8293c53f..64fdd52c 100644
--- a/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/PaletteDemo.axaml
@@ -21,6 +21,7 @@
+
@@ -115,7 +116,6 @@
-
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
index 4a53cb75..cf234541 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
@@ -47,6 +47,7 @@ public ObservableCollection? DarkLists
}
public ObservableCollection FunctionalColors { get; set; } = [];
+ public ObservableCollection Shadows { get; set; } = [];
public PaletteDemoViewModel()
{
@@ -59,6 +60,7 @@ public void InitializeResources()
{
InitializePalette();
InitializeFunctionalColors();
+ InitializeShadows();
}
private void InitializePalette()
@@ -97,6 +99,11 @@ private void InitializeFunctionalColors()
FunctionalColors.Add(new FunctionalColorGroupViewModel("Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens));
}
+ private void InitializeShadows()
+ {
+ Shadows.Add(new ShadowGroupViewModel("Shadow", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.ShadowTokens));
+ }
+
private void OnClickColorItem(PaletteDemoViewModel vm, ColorItemViewModel item)
{
SelectedColor = item;
@@ -254,6 +261,79 @@ public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDic
}
}
+public class ShadowItemViewModel : ObservableObject
+{
+ private string _shadowDisplayName = null!;
+
+ public string ShadowDisplayName
+ {
+ get => _shadowDisplayName;
+ set => SetProperty(ref _shadowDisplayName, value);
+ }
+
+ private string _resourceKey = null!;
+
+ public string ResourceKey
+ {
+ get => _resourceKey;
+ set => SetProperty(ref _resourceKey, value);
+ }
+
+ private string _boxShadowValue = null!;
+
+ public string BoxShadowValue
+ {
+ get => _boxShadowValue;
+ set => SetProperty(ref _boxShadowValue, value);
+ }
+
+ public ShadowItemViewModel(string shadowDisplayName, BoxShadows boxShadows, string resourceKey)
+ {
+ ShadowDisplayName = shadowDisplayName;
+ ResourceKey = resourceKey;
+ BoxShadowValue = boxShadows.ToString();
+ }
+}
+
+public class ShadowGroupViewModel : ObservableObject
+{
+ private string _title = null!;
+
+ public string Title
+ {
+ get => _title;
+ set => SetProperty(ref _title, value);
+ }
+
+ public ObservableCollection LightShadows { get; set; } = [];
+ public ObservableCollection DarkShadows { get; set; } = [];
+
+
+ public ShadowGroupViewModel(string title, IResourceDictionary? lightDictionary,
+ IResourceDictionary? darkDictionary, IReadOnlyList> tokens)
+ {
+ Title = title;
+ foreach (var (key, name) in tokens)
+ {
+ if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false)
+ {
+ if (lightValue is BoxShadows lightShadow)
+ {
+ LightShadows.Add(new ShadowItemViewModel(name, lightShadow, key));
+ }
+ }
+
+ if (darkDictionary?.TryGetValue(key, out var darkValue) ?? false)
+ {
+ if (darkValue is BoxShadows darkShadow)
+ {
+ DarkShadows.Add(new ShadowItemViewModel(name, darkShadow, key));
+ }
+ }
+ }
+ }
+}
+
public static class ColorTokens
{
public static IReadOnlyList> PrimaryTokens { get; } = new List>
@@ -374,4 +454,10 @@ public static class ColorTokens
new("SemiColorDisabledBackground", "Disabled Background"),
new("SemiColorDisabledFill", "Disabled Fill"),
};
+
+ public static IReadOnlyList> ShadowTokens { get; } = new List>
+ {
+ new("SemiColorShadow", "Shadow"),
+ new("SemiShadowElevated", "Shadow Elevated"),
+ };
}
\ No newline at end of file
From 8e88f79c90011ca21db52a6e3634b183632d8f8f Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 15 Nov 2024 02:22:03 +0800
Subject: [PATCH 26/42] misc: unify BoxShadows resources.
(cherry picked from commit 8cdac330a4143fcb0ee2d95f29d10e5cce08f0ff)
---
src/Semi.Avalonia.ColorPicker/Dark.axaml | 2 +-
src/Semi.Avalonia.ColorPicker/Light.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Border.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/ComboBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Flyout.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Menu.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml | 2 +-
src/Semi.Avalonia/Themes/Dark/Palette.axaml | 4 ++--
src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Border.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/ComboBox.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Flyout.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Menu.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/NotificationCard.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/Palette.axaml | 4 ++--
20 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/Semi.Avalonia.ColorPicker/Dark.axaml b/src/Semi.Avalonia.ColorPicker/Dark.axaml
index 7ba3a79b..f5148612 100644
--- a/src/Semi.Avalonia.ColorPicker/Dark.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Dark.axaml
@@ -17,5 +17,5 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/Light.axaml b/src/Semi.Avalonia.ColorPicker/Light.axaml
index 946f7076..514b984a 100644
--- a/src/Semi.Avalonia.ColorPicker/Light.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Light.axaml
@@ -17,5 +17,5 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index 575d3786..032758ea 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Border.axaml b/src/Semi.Avalonia/Themes/Dark/Border.axaml
index d36d0ac1..8593cc12 100644
--- a/src/Semi.Avalonia/Themes/Dark/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Border.axaml
@@ -1,5 +1,5 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
index 5c50c6d0..e75aa2a7 100644
--- a/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
index 82bb56d1..166a38b5 100644
--- a/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ComboBox.axaml
@@ -17,7 +17,7 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
index 4f941075..c4c6b044 100644
--- a/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/DateTimePickerShared.axaml
@@ -24,5 +24,5 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
index 0d865df1..463e7fa0 100644
--- a/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Flyout.axaml
@@ -2,5 +2,5 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Menu.axaml b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
index c4556002..28e7d143 100644
--- a/src/Semi.Avalonia/Themes/Dark/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Menu.axaml
@@ -5,7 +5,7 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
index 56a1d39d..b7d7d0c4 100644
--- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -5,7 +5,7 @@
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
index 9fa87323..9d52d2ed 100644
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml
@@ -423,6 +423,6 @@
- 0 0 0 0 #0A000000
- inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000
+ 0 0 #0A000000
+ inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index 520f9b5f..24d2c0ef 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -1,5 +1,5 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Border.axaml b/src/Semi.Avalonia/Themes/Light/Border.axaml
index be23f5cc..9a473d0d 100644
--- a/src/Semi.Avalonia/Themes/Light/Border.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Border.axaml
@@ -1,5 +1,5 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
index 7aad8146..d9b41d12 100644
--- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml
@@ -7,7 +7,7 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
index 1b2e15de..2d3f8a5c 100644
--- a/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ComboBox.axaml
@@ -16,7 +16,7 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
index 982ecf0f..b06932cd 100644
--- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml
@@ -26,5 +26,5 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
index aac33f59..85ef4912 100644
--- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -2,5 +2,5 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Light/Menu.axaml
index a90c874d..9e8b2819 100644
--- a/src/Semi.Avalonia/Themes/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Menu.axaml
@@ -5,7 +5,7 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
index a25270db..e1c57323 100644
--- a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
@@ -5,7 +5,7 @@
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml
index 9be8e8f2..af79721e 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml
@@ -423,6 +423,6 @@
- 0 0 0 0 #0A000000
- 0 0 1 0 #4A000000, 0 4 14 0 #1A000000
+ 0 0 #0A000000
+ 0 0 1 #4A000000, 0 4 14 #1A000000
\ No newline at end of file
From c30f8d2456f1e1c315456a36034c9953719d1a41 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 15 Nov 2024 17:01:48 +0800
Subject: [PATCH 27/42] fix: fix font issue in WASM demo.
(cherry picked from commit b31b622a2e30e58910390cb1524c4a15d98e3702)
---
.../Assets/Fonts/SourceHanSansCN-Bold.otf | Bin 0 -> 8543504 bytes
.../{ => Fonts}/SourceHanSansCN-Regular.otf | Bin
.../AvaloniaAppBuilderExtensions.cs | 2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Bold.otf
rename demo/Semi.Avalonia.Demo.Web/Assets/{ => Fonts}/SourceHanSansCN-Regular.otf (100%)
diff --git a/demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Bold.otf b/demo/Semi.Avalonia.Demo.Web/Assets/Fonts/SourceHanSansCN-Bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..8e1e8694921a6f836ee87510b7ad4cc735c576e5
GIT binary patch
literal 8543504
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