From add5ef02a00d0d15e54577bb5d5f3cf9c0dbc596 Mon Sep 17 00:00:00 2001
From: VisualMelon <VisualMelon@users.noreply.github.com>
Date: Thu, 12 Sep 2024 04:00:09 +0100
Subject: [PATCH] Fix SimpleTheme for TimePicker (#16758)

* Fix control template for TimePicker in Simple theme

* Tidy template declarations in TimePicker.cs
---
 src/Avalonia.Controls/DateTimePickers/TimePicker.cs | 6 +++---
 src/Avalonia.Themes.Simple/Controls/TimePicker.xaml | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index 111c9ff623..d145298563 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -24,9 +24,9 @@ namespace Avalonia.Controls
     [TemplatePart("PART_Popup",                   typeof(Popup))]
     [TemplatePart("PART_SecondColumnDivider",     typeof(Rectangle))]
     [TemplatePart("PART_SecondPickerHost",        typeof(Border))]
-    [TemplatePart("PART_ThirdColumnDivider",     typeof(Rectangle))]
-    [TemplatePart("PART_ThirdPickerHost",        typeof(Border))]
-    [TemplatePart("PART_FourthPickerHost",         typeof(Border))]
+    [TemplatePart("PART_ThirdColumnDivider",      typeof(Rectangle))]
+    [TemplatePart("PART_ThirdPickerHost",         typeof(Border))]
+    [TemplatePart("PART_FourthPickerHost",        typeof(Border))]
     [PseudoClasses(":hasnotime")]
     public class TimePicker : TemplatedControl
     {
diff --git a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
index 3a74278ebd..3a5e9ec1b1 100644
--- a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -173,12 +173,6 @@
                              FontSize="{TemplateBinding FontSize}"
                              FontWeight="{TemplateBinding FontWeight}" />
                 </Border>
-                
-                <Rectangle Name="PART_ThirdColumnDivider"
-                           Grid.Column="5"
-                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                           HorizontalAlignment="Center"
-                           Fill="{DynamicResource TimePickerSpacerFill}" />
               </Grid>
             </Button>