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

feat: make panel format nullable. Update display text on display format change.

Browse Source
This commit is contained in:
rabbitism
2024-05-16 22:48:46 +08:00
parent 18e5996f73
commit 2ccea8fe1e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ursa/Controls/DateTimePicker/TimePicker.cs
View File

@@ -39,6 +39,16 @@ public class TimePicker : TimePickerBase, IClearControl
{ {
SelectedTimeProperty.Changed.AddClassHandler<TimePicker, TimeSpan?>((picker, args) => SelectedTimeProperty.Changed.AddClassHandler<TimePicker, TimeSpan?>((picker, args) =>
picker.OnSelectionChanged(args)); picker.OnSelectionChanged(args));
DisplayFormatProperty.Changed.AddClassHandler<TimePicker, string?>((picker, args) => picker.OnDisplayFormatChanged(args));
}
private void OnDisplayFormatChanged(AvaloniaPropertyChangedEventArgs<string?> args)
{
if (_textBox is null) return;
var time = SelectedTime;
var date = new DateTime( 1, 1, 1, time.Value.Hours, time.Value.Minutes, time.Value.Seconds);
var text = date.ToString(DisplayFormat);
_textBox.Text = text;
} }
public string? Watermark public string? Watermark

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

@@ -130,12 +130,12 @@ public class TimePickerPresenter : TemplatedControl
private void OnPanelFormatChanged(AvaloniaPropertyChangedEventArgs<string> args) private void OnPanelFormatChanged(AvaloniaPropertyChangedEventArgs<string> args)
{ {
var format = args.NewValue.Value; var format = args.NewValue.Value;
UpdatePanelLayout(format); UpdatePanelLayout(format);
} }
private void UpdatePanelLayout(string panelFormat) private void UpdatePanelLayout(string? panelFormat)
{ {
if (panelFormat is null) return;
var parts = panelFormat.Split(new[] { ' ', '-', ':' }, StringSplitOptions.RemoveEmptyEntries); var parts = panelFormat.Split(new[] { ' ', '-', ':' }, StringSplitOptions.RemoveEmptyEntries);
var panels = new List<Control?>(); var panels = new List<Control?>();
foreach (var part in parts) foreach (var part in parts)