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

feat: update focus logic.

Browse Source
This commit is contained in:
rabbitism
2024-03-11 17:02:08 +08:00
parent 99cae144e4
commit 7869752330
4 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Ursa/Controls/VerificationCode/VerificationCode.cs
View File

@@ -8,6 +8,7 @@ using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.LogicalTree;
using Avalonia.Utilities;
using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
@@ -108,12 +109,16 @@ public class VerificationCode: TemplatedControl
{
if (e.Source is Control t)
{
var text = t.FindLogicalAncestorOfType<VerificationCodeItem>();
if (text != null)
/*
var item = t.FindLogicalAncestorOfType<VerificationCodeItem>();
if (item != null)
{
text.Focus();
_currentIndex = _itemsControl?.IndexFromContainer(text) ?? 0;
item.Focus();
_currentIndex = _itemsControl?.IndexFromContainer(item) ?? 0;
}
*/
_currentIndex = MathUtilities.Clamp(_currentIndex, 0, Count - 1);
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus();
}
e.Handled = true;
}
@@ -157,6 +162,7 @@ public class VerificationCode: TemplatedControl
base.OnKeyDown(e);
if (e.Key == Key.Back && _currentIndex >= 0)
{
_currentIndex = MathUtilities.Clamp(_currentIndex, 0, Count - 1);
var presenter = _itemsControl?.ContainerFromIndex(_currentIndex) as VerificationCodeItem;
if (presenter is null) return;
Digits[_currentIndex] = string.Empty;
@@ -165,15 +171,5 @@ public class VerificationCode: TemplatedControl
_currentIndex--;
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus();
}
else if(e.Key == Key.Left && _currentIndex > 0)
{
_currentIndex--;
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus();
}
else if(e.Key == Key.Right && _currentIndex < Count)
{
_currentIndex++;
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus();
}
}
}