From 2dda677fc8099a484806be21574e1a5bbbf721b8 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 10 Jul 2022 22:26:28 +0200 Subject: [PATCH] Ported SplitButton to ControlTheme. Not happy with the Tag hack but no better way to add additional states to a control currently. --- .../Controls/FluentControls.xaml | 2 +- .../Controls/SplitButton.xaml | 388 ++++++++---------- 2 files changed, 173 insertions(+), 217 deletions(-) diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml index 262007082f..bc2352d5d0 100644 --- a/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml +++ b/src/Avalonia.Themes.Fluent/Controls/FluentControls.xaml @@ -39,6 +39,7 @@ + @@ -72,7 +73,6 @@ - diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml index fb0460d9a1..9a93b2625b 100644 --- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml +++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml @@ -1,36 +1,120 @@ - - - + + Hello - + + + Hello + + + Disabled + + + Hello + + + Hello + - - 32 - 32 - 1 - 32 + 32 + 32 + 1 + 32 - - - - + + + - + + + + + + + + + + + + + + + + + + + + @@ -40,211 +124,83 @@ - - - - - - - - - - -