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

fix: fix offset triggering selection change.

Browse Source
This commit is contained in:
rabbitism
2024-04-27 23:35:39 +08:00
parent 9623a63589
commit 7fb6147d33
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,7 +240,7 @@ public class TimePickerPresenter : TemplatedControl
>= 12 => 1, >= 12 => 1,
_ => 0 _ => 0
}; };
_ampmSelector.SelectedValue = ampm; SetIfChanged(_ampmSelector, ampm);
} }
var newTime = new TimeSpan(hour, minute, second); var newTime = new TimeSpan(hour, minute, second);
if (NeedsConfirmation) if (NeedsConfirmation)
@@ -256,18 +256,19 @@ public class TimePickerPresenter : TemplatedControl
{ {
var index = _use12Clock ? time.Value.Hours % 12 : time.Value.Hours; var index = _use12Clock ? time.Value.Hours % 12 : time.Value.Hours;
if (_use12Clock && index == 0) index = 12; if (_use12Clock && index == 0) index = 12;
_hourSelector.SelectedValue = index; SetIfChanged(_hourSelector, index);
} }
SetIfChanged(_minuteSelector, time.Value.Minutes);
SetIfChanged(_secondSelector, time.Value.Seconds);
var ampm = time.Value.Hours switch
{
>= 12 => 1,
_ => 0
};
if (_minuteSelector is not null) _minuteSelector.SelectedValue = time.Value.Minutes; SetIfChanged(_ampmSelector, ampm);
if (_secondSelector is not null) _secondSelector.SelectedValue = time.Value.Seconds;
if (_ampmSelector is not null) if (_ampmSelector is not null)
{ {
_ampmSelector.SelectedValue = time.Value.Hours switch
{
>= 12 => 1,
_ => 0
};
_ampmSelector.IsEnabled = _use12Clock; _ampmSelector.IsEnabled = _use12Clock;
} }
} }
@@ -308,4 +309,10 @@ public class TimePickerPresenter : TemplatedControl
{ {
if (NeedsConfirmation) SetCurrentValue(TimeProperty, _timeHolder); if (NeedsConfirmation) SetCurrentValue(TimeProperty, _timeHolder);
} }
private void SetIfChanged(DateTimePickerPanel? panel, int index)
{
if (panel is null) return;
if (panel.SelectedValue != index) panel.SelectedValue = index;
}
} }