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

Merge pull request #232 from AlvinRey/Fix-TimeBox

Browse Source 
(fix) Some functionality doesn't work when TimeBox is contained in DataGrid
This commit is contained in:
Dong Bin
2024-05-18 13:51:00 +08:00
committed by GitHub
parent f453801f59 dd98227dac
commit d6b55b2fbc
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ public class TimeBox : TemplatedControl
}
_currentActiveSectionIndex = i;
if (e.ClickCount == 2)
{
EnterSection(_currentActiveSectionIndex.Value);
@@ -332,6 +332,8 @@ public class TimeBox : TemplatedControl
MoveCaret(_currentActiveSectionIndex.Value);
}
}
e.Pointer.Capture(_presenters[_currentActiveSectionIndex.Value]);
e.Handled = true;
}
protected override void OnPointerReleased(PointerReleasedEventArgs e)
@@ -480,13 +482,16 @@ public class TimeBox : TemplatedControl
if (AllowDrag)
_dragPanels[index].IsVisible = false;
_presenters[index].ShowCaret();
_isShowedCaret[index] = true;
ShowCaretInteral(index);
_presenters[index].SelectAll();
}
private void MoveCaret(int index)
{
if (!_isShowedCaret[index])
{
ShowCaretInteral(index);
}
_presenters[index].ClearSelection();
var caretPosition =
_pressedPosition.WithX(_pressedPosition.X - _borders[index].Bounds.X);
@@ -503,8 +508,7 @@ public class TimeBox : TemplatedControl
_presenters[index].ClearSelection();
if (_isShowedCaret[index])
{
_presenters[index].HideCaret();
_isShowedCaret[index] = false;
HideCaretInteral(index);
}
if (AllowDrag)
@@ -694,4 +698,16 @@ public class TimeBox : TemplatedControl
return milliSecond;
}
private void ShowCaretInteral(int index)
{
_presenters[index].ShowCaret();
_isShowedCaret[index] = true;
}
private void HideCaretInteral(int index)
{
_presenters[index].HideCaret();
_isShowedCaret[index] = false;
}
}