Skip to content

Commit 138797f

Browse files
fix added
1 parent 5030975 commit 138797f

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#nullable enable
2+
using Microsoft.UI.Xaml;
23
using Microsoft.UI.Xaml.Controls;
34
using WBrush = Microsoft.UI.Xaml.Media.Brush;
45

@@ -11,11 +12,13 @@ public partial class DatePickerHandler : ViewHandler<IDatePicker, CalendarDatePi
1112
protected override void ConnectHandler(CalendarDatePicker platformView)
1213
{
1314
platformView.DateChanged += DateChanged;
15+
platformView.Loaded += OnLoaded;
1416
}
1517

1618
protected override void DisconnectHandler(CalendarDatePicker platformView)
1719
{
1820
platformView.DateChanged -= DateChanged;
21+
platformView.Loaded -= OnLoaded;
1922
}
2023

2124
public static partial void MapFormat(IDatePickerHandler handler, IDatePicker datePicker)
@@ -81,6 +84,14 @@ private void DateChanged(CalendarDatePicker sender, CalendarDatePickerDateChange
8184
VirtualView.Date = args.NewDate.Value.Date;
8285
}
8386

87+
void OnLoaded(object sender, RoutedEventArgs e)
88+
{
89+
if (VirtualView is not null)
90+
{
91+
PlatformView?.UpdateCharacterSpacing(VirtualView);
92+
}
93+
}
94+
8495
public static partial void MapBackground(IDatePickerHandler handler, IDatePicker datePicker)
8596
{
8697
handler.PlatformView?.UpdateBackground(datePicker);

src/Core/src/Platform/Windows/DatePickerExtensions.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ public static void UpdateMaximumDate(this CalendarDatePicker platformDatePicker,
3838

3939
public static void UpdateCharacterSpacing(this CalendarDatePicker platformDatePicker, IDatePicker datePicker)
4040
{
41-
platformDatePicker.CharacterSpacing = datePicker.CharacterSpacing.ToEm();
41+
var characterSpacing = datePicker.CharacterSpacing.ToEm();
42+
platformDatePicker.CharacterSpacing = characterSpacing;
43+
44+
var dateTextBlock = platformDatePicker.GetDescendantByName<TextBlock>("DateText");
45+
if (dateTextBlock is not null)
46+
{
47+
dateTextBlock.CharacterSpacing = characterSpacing;
48+
dateTextBlock.RefreshThemeResources();
49+
}
4250
}
4351

4452
public static void UpdateFont(this CalendarDatePicker platformDatePicker, IDatePicker datePicker, IFontManager fontManager) =>

0 commit comments

Comments
 (0)