From fc9849df8a5a642628763af850d1a983811714e4 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sat, 27 Apr 2024 13:39:03 -0400
Subject: [PATCH 1/3] Use ContentPresenter instead of ContentControl

This is what the style selectors are using and is also the correct control to use here.
---
 .../BasicControls/ComboBoxStyles.axaml           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/FluentAvalonia/Styling/ControlThemes/BasicControls/ComboBoxStyles.axaml b/src/FluentAvalonia/Styling/ControlThemes/BasicControls/ComboBoxStyles.axaml
index ab011b62..0a4de8b8 100644
--- a/src/FluentAvalonia/Styling/ControlThemes/BasicControls/ComboBoxStyles.axaml
+++ b/src/FluentAvalonia/Styling/ControlThemes/BasicControls/ComboBoxStyles.axaml
@@ -134,14 +134,14 @@
                                    Foreground="{TemplateBinding PlaceholderForeground}"
                                    IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" />
 
-                        <ContentControl x:Name="ContentPresenter"
-                                        Content="{TemplateBinding SelectionBoxItem}"
-                                        ContentTemplate="{TemplateBinding ItemTemplate}"
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Margin="{TemplateBinding Padding}"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        <ContentPresenter x:Name="ContentPresenter"
+                                          Content="{TemplateBinding SelectionBoxItem}"
+                                          ContentTemplate="{TemplateBinding ItemTemplate}"
+                                          Grid.Row="1"
+                                          Grid.Column="0"
+                                          Margin="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 
                         <Border x:Name="DropDownOverlay"
                                 Grid.Row="1"

From aadbb3804df827b4cf3b247174cacd63189f04b5 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sat, 27 Apr 2024 14:59:38 -0400
Subject: [PATCH 2/3] Update CalendarDatePicker theme

---
 .../CalendarDatePickerStyles.axaml            | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml b/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml
index 53d015c6..93a4e7ec 100644
--- a/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml
+++ b/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml
@@ -58,7 +58,6 @@
                                     Grid.Column="1"
                                     Width="32"
                                     Theme="{StaticResource CalendarDropDownButton}"
-                                    Foreground="{TemplateBinding Foreground}"
                                     Background="Transparent"
                                     BorderThickness="0"
                                     Margin="2,0,2,0"
@@ -92,5 +91,45 @@
                 </Grid>
             </ControlTemplate>
         </Setter>
+
+        <Style Selector="^">
+            <Style Selector="^ /template/ Button#PART_Button">
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundPointerOver}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_Button">
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundPointerOver}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundPressed}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_Button">
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundPressed}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushDisabled}" />
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerTextForegroundDisabled}" />
+            </Style>
+            <Style Selector="^ /template/ Button#PART_Button">
+                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForegroundDisabled}" />
+            </Style>
+        </Style>
+
     </ControlTheme>
 </ResourceDictionary>

From 1b07c7e9bcf6ede3599dd38940fa2fae1a9fa118 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Sun, 28 Apr 2024 13:27:16 -0400
Subject: [PATCH 3/3] Fix overcomplicated selector

---
 .../BasicControls/CalendarDatePickerStyles.axaml            | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml b/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml
index 93a4e7ec..7fe88066 100644
--- a/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml
+++ b/src/FluentAvalonia/Styling/ControlThemes/BasicControls/CalendarDatePickerStyles.axaml
@@ -92,10 +92,8 @@
             </ControlTemplate>
         </Setter>
 
-        <Style Selector="^">
-            <Style Selector="^ /template/ Button#PART_Button">
-                <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
-            </Style>
+        <Style Selector="^ /template/ Button#PART_Button">
+            <Setter Property="Foreground" Value="{DynamicResource CalendarDatePickerCalendarGlyphForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">