From 6aa422d30dae48a4c6ad25bb4dd4f430edc377b3 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sat, 27 Apr 2024 15:18:26 +0800 Subject: [PATCH] feat: fix ampm auto derivation. --- src/Ursa/Controls/DateTimePicker/TimePickerPresenter.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ursa/Controls/DateTimePicker/TimePickerPresenter.cs b/src/Ursa/Controls/DateTimePicker/TimePickerPresenter.cs index b8d76b9..1abfaae 100644 --- a/src/Ursa/Controls/DateTimePicker/TimePickerPresenter.cs +++ b/src/Ursa/Controls/DateTimePicker/TimePickerPresenter.cs @@ -148,8 +148,8 @@ public class TimePickerPresenter : TemplatedControl _hourSelector?.SetValue(DateTimePickerPanel.ItemFormatProperty, part.ToLower()); if (_hourSelector is not null) { - _hourSelector.MaximumValue = _use12Clock ? 11 : 23; - _hourSelector.MinimumValue = 0; + _hourSelector.MaximumValue = _use12Clock ? 12 : 23; + _hourSelector.MinimumValue = _use12Clock ? 1: 0; } } else if (part[0] == 'm' && !panels.Contains(_minuteSelector)) @@ -245,7 +245,7 @@ public class TimePickerPresenter : TemplatedControl if (_hourSelector is not null) { var index = _use12Clock ? time.Value.Hours % 12 : time.Value.Hours; - if (_use12Clock && index == 12) index = 0; + if (_use12Clock && index == 0) index = 12; _hourSelector.SelectedValue = index; } @@ -269,7 +269,7 @@ public class TimePickerPresenter : TemplatedControl { _hourSelector.ItemFormat = "hh"; _hourSelector.MaximumValue = _use12Clock ? 12 : 23; - _hourSelector.MinimumValue = 0; + _hourSelector.MinimumValue = _use12Clock ? 1 : 0; } if (_minuteSelector is not null)