diff --git a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml index 8b249b9..65e30b9 100644 --- a/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml @@ -11,10 +11,7 @@ - + + + diff --git a/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml b/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml new file mode 100644 index 0000000..6a113d4 --- /dev/null +++ b/demo/Semi.Avalonia.Demo/Themes/ToggleButton.axaml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml index c74524b..0074644 100644 --- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml +++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml @@ -8,120 +8,163 @@ d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs index 5464c27..3a69c9c 100644 --- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs @@ -1,4 +1,7 @@ +using Avalonia; using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Styling; namespace Semi.Avalonia.Demo.Views; @@ -8,4 +11,14 @@ public partial class MainView : UserControl { InitializeComponent(); } + + private void ToggleButton_OnIsCheckedChanged(object sender, RoutedEventArgs e) + { + var app = Application.Current; + if (app is not null) + { + var theme = app.ActualThemeVariant; + app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark; + } + } } \ 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 19af230..dd26aff 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml @@ -229,7 +229,11 @@ Tag="{TemplateBinding ColorModel}"> @@ -386,13 +391,7 @@ Minimum="{Binding Minimum, ElementName=Component1Slider}" NumberFormat="{StaticResource ColorViewComponentNumberFormat}" ShowButtonSpinner="False" - Value="{Binding Value, ElementName=Component1Slider}"> - - - - + Value="{Binding Value, ElementName=Component1Slider}" /> - - - - - - + Foreground="{DynamicResource DataGridRowGroupHeaderExpandIconForeground}" /> - @@ -133,9 +135,8 @@ - diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml index 2f03eac..c9608ff 100644 --- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml +++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml @@ -23,6 +23,7 @@ @@ -47,7 +48,7 @@ - + @@ -134,7 +139,11 @@ - + diff --git a/src/Semi.Avalonia/Controls/Menu.axaml b/src/Semi.Avalonia/Controls/Menu.axaml index a9316fe..2a13721 100644 --- a/src/Semi.Avalonia/Controls/Menu.axaml +++ b/src/Semi.Avalonia/Controls/Menu.axaml @@ -132,15 +132,17 @@ - + Stretch="Uniform"> + diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml index 3d67fd1..c8afe84 100644 --- a/src/Semi.Avalonia/Controls/TextBox.axaml +++ b/src/Semi.Avalonia/Controls/TextBox.axaml @@ -48,15 +48,13 @@ - + + +