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

feat: simplify code with switch.

Browse Source
This commit is contained in:
rabbitism
2024-10-22 22:18:55 +08:00
parent dd3cebe66f
commit 1991f52980
2 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Ursa/Controls/DateTimePicker/DatePicker.cs
View File

@@ -190,27 +190,23 @@ public class DatePicker: DatePickerBase, IClearControl
protected override void OnKeyDown(KeyEventArgs e)
{
if (e.Key == Key.Escape)
switch (e.Key)
{
SetCurrentValue(IsDropdownOpenProperty, false);
e.Handled = true;
return;
case Key.Escape:
SetCurrentValue(IsDropdownOpenProperty, false);
e.Handled = true;
return;
case Key.Down:
SetCurrentValue(IsDropdownOpenProperty, true);
e.Handled = true;
return;
case Key.Tab:
SetCurrentValue(IsDropdownOpenProperty, false);
return;
default:
base.OnKeyDown(e);
break;
}
if (e.Key == Key.Down)
{
SetCurrentValue(IsDropdownOpenProperty, true);
e.Handled = true;
return;
}
if (e.Key == Key.Tab)
{
SetCurrentValue(IsDropdownOpenProperty, false);
return;
}
base.OnKeyDown(e);
}
public void Clear()

38
src/Ursa/Controls/DateTimePicker/DateRangePicker.cs
View File

@@ -434,30 +434,28 @@ public class DateRangePicker : DatePickerBase, IClearControl
protected override void OnKeyDown(KeyEventArgs e)
{
if (e.Key == Key.Escape)
switch (e.Key)
{
SetCurrentValue(IsDropdownOpenProperty, false);
e.Handled = true;
return;
}
if (e.Key == Key.Down)
{
SetCurrentValue(IsDropdownOpenProperty, true);
e.Handled = true;
return;
}
if (e.Key == Key.Tab)
{
if(_endTextBox?.IsFocused == true)
{
case Key.Escape:
SetCurrentValue(IsDropdownOpenProperty, false);
e.Handled = true;
return;
case Key.Down:
SetCurrentValue(IsDropdownOpenProperty, true);
e.Handled = true;
return;
case Key.Tab:
{
if(_endTextBox?.IsFocused == true)
{
SetCurrentValue(IsDropdownOpenProperty, false);
}
return;
}
return;
default:
base.OnKeyDown(e);
break;
}
base.OnKeyDown(e);
}
}