chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: fix ampm auto derivation.

Browse Source
This commit is contained in:
rabbitism
2024-04-27 15:18:26 +08:00
parent 0e00158baf
commit 6aa422d30d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Ursa/Controls/DateTimePicker/TimePickerPresenter.cs
View File

@@ -148,8 +148,8 @@ public class TimePickerPresenter : TemplatedControl
_hourSelector?.SetValue(DateTimePickerPanel.ItemFormatProperty, part.ToLower()); _hourSelector?.SetValue(DateTimePickerPanel.ItemFormatProperty, part.ToLower());
if (_hourSelector is not null) if (_hourSelector is not null)
{ {
_hourSelector.MaximumValue = _use12Clock ? 11 : 23; _hourSelector.MaximumValue = _use12Clock ? 12 : 23;
_hourSelector.MinimumValue = 0; _hourSelector.MinimumValue = _use12Clock ? 1: 0;
} }
} }
else if (part[0] == 'm' && !panels.Contains(_minuteSelector)) else if (part[0] == 'm' && !panels.Contains(_minuteSelector))
@@ -245,7 +245,7 @@ public class TimePickerPresenter : TemplatedControl
if (_hourSelector is not null) if (_hourSelector is not null)
{ {
var index = _use12Clock ? time.Value.Hours % 12 : time.Value.Hours; 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; _hourSelector.SelectedValue = index;
} }
@@ -269,7 +269,7 @@ public class TimePickerPresenter : TemplatedControl
{ {
_hourSelector.ItemFormat = "hh"; _hourSelector.ItemFormat = "hh";
_hourSelector.MaximumValue = _use12Clock ? 12 : 23; _hourSelector.MaximumValue = _use12Clock ? 12 : 23;
_hourSelector.MinimumValue = 0; _hourSelector.MinimumValue = _use12Clock ? 1 : 0;
} }
if (_minuteSelector is not null) if (_minuteSelector is not null)