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

fix nullable issue

Browse Source
This commit is contained in:
LiWenhao
2024-04-08 16:10:44 +08:00
parent 436faccd9b
commit f31ba22a5a
1 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
src/Ursa/Controls/TimeBox.cs
View File

@@ -66,12 +66,12 @@ public class TimeBox : TemplatedControl
private Panel? _minuteDragPanel; private Panel? _minuteDragPanel;
private Panel? _secondDragPanel; private Panel? _secondDragPanel;
private Panel? _milliSecondDragPanel; private Panel? _milliSecondDragPanel;
private readonly TextPresenter?[] _presenters = new TextPresenter?[4]; private readonly TextPresenter[] _presenters = new TextPresenter[4];
private readonly Border?[] _borders = new Border?[4]; private readonly Border[] _borders = new Border[4];
private readonly Panel?[] _dragPanels = new Panel?[4]; private readonly Panel[] _dragPanels = new Panel[4];
private readonly int[] _limits = new[] { 24, 60, 60, 100 }; private readonly int[] _limits = new[] { 24, 60, 60, 100 };
private int[] _values = new int[4]; private int[] _values = new[] { 0, 0, 0, 0 };
private bool[] _isShowedCaret = new bool[4]; private bool[] _isShowedCaret = new[] { false, false, false, false };
private int? _currentActiveSectionIndex; private int? _currentActiveSectionIndex;
private bool _isAlreadyDrag = false; private bool _isAlreadyDrag = false;
private Point _pressedPosition = new Point(); private Point _pressedPosition = new Point();
@@ -96,7 +96,7 @@ public class TimeBox : TemplatedControl
} }
public static readonly StyledProperty<IBrush?> SelectionBrushProperty = public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
TextBox.SelectionBrushProperty.AddOwner<IPv4Box>(); TextBox.SelectionBrushProperty.AddOwner<TimeBox>();
public IBrush? SelectionBrush public IBrush? SelectionBrush
{ {
@@ -105,7 +105,7 @@ public class TimeBox : TemplatedControl
} }
public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty = public static readonly StyledProperty<IBrush?> SelectionForegroundBrushProperty =
TextBox.SelectionForegroundBrushProperty.AddOwner<IPv4Box>(); TextBox.SelectionForegroundBrushProperty.AddOwner<TimeBox>();
public IBrush? SelectionForegroundBrush public IBrush? SelectionForegroundBrush
{ {
@@ -113,7 +113,7 @@ public class TimeBox : TemplatedControl
set => SetValue(SelectionForegroundBrushProperty, value); set => SetValue(SelectionForegroundBrushProperty, value);
} }
public static readonly StyledProperty<IBrush?> CaretBrushProperty = TextBox.CaretBrushProperty.AddOwner<IPv4Box>(); public static readonly StyledProperty<IBrush?> CaretBrushProperty = TextBox.CaretBrushProperty.AddOwner<TimeBox>();
public IBrush? CaretBrush public IBrush? CaretBrush
{ {
@@ -150,7 +150,8 @@ public class TimeBox : TemplatedControl
} }
public static readonly StyledProperty<TimeBoxDragOrientation> DragOrientationProperty public static readonly StyledProperty<TimeBoxDragOrientation> DragOrientationProperty
= AvaloniaProperty.Register<TimeBox, TimeBoxDragOrientation>(nameof(DragOrientation), defaultValue: TimeBoxDragOrientation.Horizontal); = AvaloniaProperty.Register<TimeBox, TimeBoxDragOrientation>(nameof(DragOrientation),
defaultValue: TimeBoxDragOrientation.Horizontal);
public TimeBoxDragOrientation DragOrientation public TimeBoxDragOrientation DragOrientation
{ {
@@ -179,18 +180,19 @@ public class TimeBox : TemplatedControl
protected override void OnApplyTemplate(TemplateAppliedEventArgs e) protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{ {
base.OnApplyTemplate(e); base.OnApplyTemplate(e);
_hourText = e.NameScope.Find<TextPresenter>(PART_HoursTextPresenter); _hourText = e.NameScope.Get<TextPresenter>(PART_HoursTextPresenter);
_minuteText = e.NameScope.Find<TextPresenter>(PART_MinuteTextPresenter); _minuteText = e.NameScope.Get<TextPresenter>(PART_MinuteTextPresenter);
_secondText = e.NameScope.Find<TextPresenter>(PART_SecondTextPresenter); _secondText = e.NameScope.Get<TextPresenter>(PART_SecondTextPresenter);
_milliSecondText = e.NameScope.Find<TextPresenter>(PART_MillisecondTextPresenter); _milliSecondText = e.NameScope.Get<TextPresenter>(PART_MillisecondTextPresenter);
_hourBorder = e.NameScope.Find<Border>(PART_HourBorder); _hourBorder = e.NameScope.Get<Border>(PART_HourBorder);
_minuteBorder = e.NameScope.Find<Border>(PART_MinuteBorder); _minuteBorder = e.NameScope.Get<Border>(PART_MinuteBorder);
_secondBorder = e.NameScope.Find<Border>(PART_SecondBorder); _secondBorder = e.NameScope.Get<Border>(PART_SecondBorder);
_milliSecondBorder = e.NameScope.Find<Border>(PART_MilliSecondBorder); _milliSecondBorder = e.NameScope.Get<Border>(PART_MilliSecondBorder);
_hourDragPanel = e.NameScope.Find<Panel>(PART_HourDragPanel); _hourDragPanel = e.NameScope.Get<Panel>(PART_HourDragPanel);
_minuteDragPanel = e.NameScope.Find<Panel>(PART_MinuteDragPanel); _minuteDragPanel = e.NameScope.Get<Panel>(PART_MinuteDragPanel);
_secondDragPanel = e.NameScope.Find<Panel>(PART_SecondDragPanel); _secondDragPanel = e.NameScope.Get<Panel>(PART_SecondDragPanel);
_milliSecondDragPanel = e.NameScope.Find<Panel>(PART_MilliSecondDragPanel); _milliSecondDragPanel = e.NameScope.Get<Panel>(PART_MilliSecondDragPanel);
_presenters[0] = _hourText; _presenters[0] = _hourText;
_presenters[1] = _minuteText; _presenters[1] = _minuteText;
_presenters[2] = _secondText; _presenters[2] = _secondText;
@@ -205,12 +207,10 @@ public class TimeBox : TemplatedControl
_dragPanels[3] = _milliSecondDragPanel; _dragPanels[3] = _milliSecondDragPanel;
IsVisibleProperty.SetValue(AllowDrag, _dragPanels); IsVisibleProperty.SetValue(AllowDrag, _dragPanels);
_hourText.Text = Time != null ? Time.Value.Hours.ToString() : "0";
if (_hourText != null) _hourText.Text = Time != null ? Time.Value.Hours.ToString() : "0"; _minuteText.Text = Time != null ? Time.Value.Minutes.ToString() : "0";
if (_minuteText != null) _minuteText.Text = Time != null ? Time.Value.Minutes.ToString() : "0"; _secondText.Text = Time != null ? Time.Value.Seconds.ToString() : "0";
if (_secondText != null) _secondText.Text = Time != null ? Time.Value.Seconds.ToString() : "0"; _milliSecondText.Text = Time != null ? ClampMilliSecond(Time.Value.Milliseconds).ToString() : "0";
if (_milliSecondText != null)
_milliSecondText.Text = Time != null ? ClampMilliSecond(Time.Value.Milliseconds).ToString() : "0";
ParseTimeSpan(ShowLeadingZero); ParseTimeSpan(ShowLeadingZero);
PointerMovedEvent.AddHandler(OnDragPanelPointerMoved, _dragPanels); PointerMovedEvent.AddHandler(OnDragPanelPointerMoved, _dragPanels);
@@ -264,36 +264,36 @@ public class TimeBox : TemplatedControl
string? s = e.Text; string? s = e.Text;
if (string.IsNullOrEmpty(s)) return; if (string.IsNullOrEmpty(s)) return;
if (!char.IsNumber(s![0])) return; if (!char.IsNumber(s![0])) return;
if (_currentActiveSectionIndex.HasValue && _presenters[_currentActiveSectionIndex.Value] != null) if (_currentActiveSectionIndex is null) return;
int caretIndex = Math.Min(_presenters[_currentActiveSectionIndex.Value].CaretIndex
, _presenters[_currentActiveSectionIndex.Value].Text.Length);
if (_presenters[_currentActiveSectionIndex.Value].Text is null)
{ {
int caretIndex = Math.Min(_presenters[_currentActiveSectionIndex.Value].CaretIndex _presenters[_currentActiveSectionIndex.Value].Text = s;
, _presenters[_currentActiveSectionIndex.Value].Text.Length); _presenters[_currentActiveSectionIndex.Value].MoveCaretHorizontal();
string? oldText = _presenters[_currentActiveSectionIndex.Value].Text; }
if (oldText is null) else
{
_presenters[_currentActiveSectionIndex.Value].DeleteSelection();
_presenters[_currentActiveSectionIndex.Value].ClearSelection();
string oldText = _presenters[_currentActiveSectionIndex.Value].Text;
string newText = oldText.Length == 0
? s
: oldText.Substring(0, caretIndex) + s + oldText.Substring(Math.Min(caretIndex, oldText.Length));
// Limit the maximum number of input digits
if (newText.Length > 2)
{ {
_presenters[_currentActiveSectionIndex.Value].Text = s; newText = newText.Substring(0, 2);
_presenters[_currentActiveSectionIndex.Value].MoveCaretHorizontal();
} }
else
_presenters[_currentActiveSectionIndex.Value].Text = newText;
_presenters[_currentActiveSectionIndex.Value].MoveCaretHorizontal();
if (_presenters[_currentActiveSectionIndex.Value].CaretIndex == 2 && InputMode == TimeBoxInputMode.Fast)
{ {
_presenters[_currentActiveSectionIndex.Value].DeleteSelection(); MoveToNextSection(_currentActiveSectionIndex.Value);
_presenters[_currentActiveSectionIndex.Value].ClearSelection();
oldText = _presenters[_currentActiveSectionIndex.Value].Text;
string newText = string.IsNullOrEmpty(oldText)
? s
: oldText?.Substring(0, caretIndex) + s + oldText?.Substring(Math.Min(caretIndex, oldText.Length));
if (newText.Length > 2)
{
newText = newText.Substring(0, 2);
}
_presenters[_currentActiveSectionIndex.Value].Text = newText;
_presenters[_currentActiveSectionIndex.Value].MoveCaretHorizontal();
if (_presenters[_currentActiveSectionIndex.Value].CaretIndex == 2 && InputMode == TimeBoxInputMode.Fast)
{
MoveToNextSection(_currentActiveSectionIndex.Value);
}
} }
} }
} }
@@ -304,7 +304,7 @@ public class TimeBox : TemplatedControl
_lastDragPoint = _pressedPosition; _lastDragPoint = _pressedPosition;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
{ {
if (_borders[i]?.Bounds.Contains(_pressedPosition) ?? false) if (_borders[i].Bounds.Contains(_pressedPosition))
{ {
_currentActiveSectionIndex = i; _currentActiveSectionIndex = i;
} }
@@ -326,6 +326,8 @@ public class TimeBox : TemplatedControl
{ {
EnterSection(_currentActiveSectionIndex.Value); EnterSection(_currentActiveSectionIndex.Value);
} }
_lastDragPoint = null;
} }
protected override void OnLostFocus(RoutedEventArgs e) protected override void OnLostFocus(RoutedEventArgs e)
@@ -344,6 +346,10 @@ public class TimeBox : TemplatedControl
private void OnFormatChange(AvaloniaPropertyChangedEventArgs arg) private void OnFormatChange(AvaloniaPropertyChangedEventArgs arg)
{ {
// this function will be call ahead of OnApplyTemplate() if Set ShowLeadingZero in axaml, so that _xxxText could be null
if (_hourText is null || _minuteText is null || _secondText is null || _milliSecondText is null)
return;
bool showLeadingZero = arg.GetNewValue<bool>(); bool showLeadingZero = arg.GetNewValue<bool>();
ParseTimeSpan(showLeadingZero); ParseTimeSpan(showLeadingZero);
} }
@@ -355,21 +361,25 @@ public class TimeBox : TemplatedControl
private void OnTimeChanged(AvaloniaPropertyChangedEventArgs arg) private void OnTimeChanged(AvaloniaPropertyChangedEventArgs arg)
{ {
// this function will be call ahead of OnApplyTemplate() if bind Time in axaml, so that _xxxText could be null
if (_hourText is null || _minuteText is null || _secondText is null || _milliSecondText is null)
return;
TimeSpan? timeSpan = arg.GetNewValue<TimeSpan?>(); TimeSpan? timeSpan = arg.GetNewValue<TimeSpan?>();
if (timeSpan is null) if (timeSpan is null)
{ {
if (_hourText != null) _hourText.Text = String.Empty; _hourText.Text = String.Empty;
if (_minuteText != null) _minuteText.Text = String.Empty; _minuteText.Text = String.Empty;
if (_secondText != null) _secondText.Text = String.Empty; _secondText.Text = String.Empty;
if (_milliSecondText != null) _milliSecondText.Text = String.Empty; _milliSecondText.Text = String.Empty;
ParseTimeSpan(ShowLeadingZero); ParseTimeSpan(ShowLeadingZero);
} }
else else
{ {
if (_hourText != null) _hourText.Text = timeSpan.Value.Hours.ToString(); _hourText.Text = timeSpan.Value.Hours.ToString();
if (_minuteText != null) _minuteText.Text = timeSpan.Value.Minutes.ToString(); _minuteText.Text = timeSpan.Value.Minutes.ToString();
if (_secondText != null) _secondText.Text = timeSpan.Value.Seconds.ToString(); _secondText.Text = timeSpan.Value.Seconds.ToString();
if (_milliSecondText != null) _milliSecondText.Text = ClampMilliSecond(timeSpan.Value.Milliseconds).ToString(); _milliSecondText.Text = ClampMilliSecond(timeSpan.Value.Milliseconds).ToString();
ParseTimeSpan(ShowLeadingZero); ParseTimeSpan(ShowLeadingZero);
} }
} }
@@ -377,14 +387,6 @@ public class TimeBox : TemplatedControl
private void ParseTimeSpan(bool showLeadingZero, bool skipParseFromText = false) private void ParseTimeSpan(bool showLeadingZero, bool skipParseFromText = false)
{ {
string format = showLeadingZero ? "D2" : ""; string format = showLeadingZero ? "D2" : "";
if (_hourText is null || _minuteText is null || _secondText is null || _milliSecondText is null)
{
_values[0] = 0;
_values[1] = 0;
_values[2] = 0;
_values[3] = 0;
return;
}
if (!skipParseFromText) if (!skipParseFromText)
{ {
@@ -401,17 +403,14 @@ public class TimeBox : TemplatedControl
_secondText.Text = _values[2].ToString(format); _secondText.Text = _values[2].ToString(format);
_milliSecondText.Text = _values[3].ToString(format); _milliSecondText.Text = _values[3].ToString(format);
} }
private void OnDragPanelPointerMoved(object sender, PointerEventArgs e) private void OnDragPanelPointerMoved(object sender, PointerEventArgs e)
{ {
if (!AllowDrag) return; if (!AllowDrag) return;
if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return; if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
var point = e.GetPosition(this); var point = e.GetPosition(this);
var delta = point - _lastDragPoint; var delta = point - _lastDragPoint;
if (delta is null) if (delta is null) return;
{
return;
}
int d = GetDelta(delta.Value); int d = GetDelta(delta.Value);
if (d > 0) if (d > 0)
{ {
@@ -446,11 +445,13 @@ public class TimeBox : TemplatedControl
_ => 0 _ => 0
}; };
} }
return 0; return 0;
} }
private void EnterSection(int index) private void EnterSection(int index)
{ {
if(index < 0 || index > 3) return;
if (!_isShowedCaret[index]) if (!_isShowedCaret[index])
{ {
if (AllowDrag && _dragPanels[index] != null) if (AllowDrag && _dragPanels[index] != null)
@@ -470,7 +471,7 @@ public class TimeBox : TemplatedControl
private void LeaveSection(int index) private void LeaveSection(int index)
{ {
if (_presenters[index] is null) return; if(index < 0 || index > 3) return;
_presenters[index].ClearSelection(); _presenters[index].ClearSelection();
if (_isShowedCaret[index]) if (_isShowedCaret[index])
{ {
@@ -484,8 +485,7 @@ public class TimeBox : TemplatedControl
private bool MoveToNextSection(int index) private bool MoveToNextSection(int index)
{ {
if (_presenters[index] is null) return false; if(index < 0 || index >= 3) return false;
if (index == 3) return false;
LeaveSection(index); LeaveSection(index);
_currentActiveSectionIndex = index + 1; _currentActiveSectionIndex = index + 1;
EnterSection(_currentActiveSectionIndex.Value); EnterSection(_currentActiveSectionIndex.Value);
@@ -494,8 +494,7 @@ public class TimeBox : TemplatedControl
private bool MoveToPreviousSection(int index) private bool MoveToPreviousSection(int index)
{ {
if (_presenters[index] is null) return false; if(index <= 0 || index > 3) return false;
if (index == 0) return false;
LeaveSection(index); LeaveSection(index);
_currentActiveSectionIndex = index - 1; _currentActiveSectionIndex = index - 1;
EnterSection(_currentActiveSectionIndex.Value); EnterSection(_currentActiveSectionIndex.Value);
@@ -562,7 +561,7 @@ public class TimeBox : TemplatedControl
private void DeleteImplementation(int index) private void DeleteImplementation(int index)
{ {
if (_presenters[index] is null) return; if(index < 0 || index > 3) return;
var oldText = _presenters[index].Text; var oldText = _presenters[index].Text;
if (_presenters[index].SelectionStart != _presenters[index].SelectionEnd) if (_presenters[index].SelectionStart != _presenters[index].SelectionEnd)
{ {
@@ -615,6 +614,7 @@ public class TimeBox : TemplatedControl
_values[index] = 0; _values[index] = 0;
} }
} }
return success; return success;
} }
@@ -628,14 +628,14 @@ public class TimeBox : TemplatedControl
private void Increase() private void Increase()
{ {
if(_currentActiveSectionIndex is null)return; if (_currentActiveSectionIndex is null) return;
if(_currentActiveSectionIndex.Value == 0) if (_currentActiveSectionIndex.Value == 0)
_values[0] += 1; _values[0] += 1;
else if(_currentActiveSectionIndex.Value == 1) else if (_currentActiveSectionIndex.Value == 1)
_values[1] += 1; _values[1] += 1;
else if(_currentActiveSectionIndex.Value == 2) else if (_currentActiveSectionIndex.Value == 2)
_values[2] += 1; _values[2] += 1;
else if(_currentActiveSectionIndex.Value == 3) else if (_currentActiveSectionIndex.Value == 3)
_values[3] += 1; _values[3] += 1;
ParseTimeSpan(ShowLeadingZero, true); ParseTimeSpan(ShowLeadingZero, true);
//SetTimeSpanInternal(); //SetTimeSpanInternal();
@@ -643,14 +643,14 @@ public class TimeBox : TemplatedControl
private void Decrease() private void Decrease()
{ {
if(_currentActiveSectionIndex is null)return; if (_currentActiveSectionIndex is null) return;
if(_currentActiveSectionIndex.Value == 0) if (_currentActiveSectionIndex.Value == 0)
_values[0] -= 1; _values[0] -= 1;
else if(_currentActiveSectionIndex.Value == 1) else if (_currentActiveSectionIndex.Value == 1)
_values[1] -= 1; _values[1] -= 1;
else if(_currentActiveSectionIndex.Value == 2) else if (_currentActiveSectionIndex.Value == 2)
_values[2] -= 1; _values[2] -= 1;
else if(_currentActiveSectionIndex.Value == 3) else if (_currentActiveSectionIndex.Value == 3)
_values[3] -= 1; _values[3] -= 1;
ParseTimeSpan(ShowLeadingZero, true); ParseTimeSpan(ShowLeadingZero, true);
//SetTimeSpanInternal(); //SetTimeSpanInternal();