From 387c9d96c0dfacaacea3c781256fbad958c5c9b3 Mon Sep 17 00:00:00 2001
From: Dong Bin <14807942+rabbitism@users.noreply.github.com>
Date: Wed, 8 Apr 2026 16:08:41 +0800
Subject: [PATCH] fix(datepicker): fix date picker spacer location. (#21093)

---
 .../DateTimePickers/DatePickerPresenter.cs            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
index bfe928309f..eac695b0b1 100644
--- a/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DatePickerPresenter.cs
@@ -457,18 +457,17 @@ namespace Avalonia.Controls
                 }
             }
 
-            ConfigureSpacer(items._firstSpacer, columnIndex > 1);
-            ConfigureSpacer(items._secondSpacer, columnIndex > 2);
+            ConfigureSpacer(items._firstSpacer, columnIndex > 1, 1);
+            ConfigureSpacer(items._secondSpacer, columnIndex > 2, 3);
+            return;
 
-            static void ConfigureSpacer(Control? spacer, bool visible)
+            static void ConfigureSpacer(Control? spacer, bool visible, int column)
             {
                 if (spacer == null)
                     return;
-
                 // ternary conditional operator is used to make sure grid cells will be validated
-                Grid.SetColumn(spacer, visible ? 1 : 0);
+                Grid.SetColumn(spacer, visible ? column : 0);
                 spacer.IsVisible = visible;
-
             }
         }