From 5f3dbae22244e830b464fc680c6c28ca124be41a Mon Sep 17 00:00:00 2001
From: Evan <109839359+Evan260@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:53:29 -0600
Subject: [PATCH] Fix DatePicker to respect Width by removing MinWidth from
 internal Button (#20487)

Co-authored-by: Julien Lebosquain <julien@lebosquain.net>
---
 src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index e7be603a16..dc7433ec38 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -79,6 +79,8 @@
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="MinWidth" Value="{DynamicResource DatePickerThemeMinWidth}" />
+    <Setter Property="MaxWidth" Value="{DynamicResource DatePickerThemeMaxWidth}" />
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
@@ -91,8 +93,7 @@
                     BorderThickness="{TemplateBinding BorderThickness}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     IsEnabled="{TemplateBinding IsEnabled}"
-                    MinWidth="{DynamicResource DatePickerThemeMinWidth}"
-                    MaxWidth="{DynamicResource DatePickerThemeMaxWidth}"
+                    MaxWidth="{TemplateBinding MaxWidth}"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     TemplatedControl.IsTemplateFocusTarget="True">