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

misc: remove warning.

Browse Source
This commit is contained in:
rabbitism
2023-02-25 13:28:34 +08:00
parent 9b28cd07b8
commit f7763d6d30
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Ursa/Controls/IPv4Box.cs
View File

@@ -10,6 +10,7 @@ using Avalonia.Input.Platform;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Media; using Avalonia.Media;
using Avalonia.Media.TextFormatting; using Avalonia.Media.TextFormatting;
// ReSharper disable InconsistentNaming
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -40,7 +41,7 @@ public class IPv4Box: TemplatedControl
private byte? _fourthByte; private byte? _fourthByte;
private readonly TextPresenter?[] _presenters = new TextPresenter?[4]; private readonly TextPresenter?[] _presenters = new TextPresenter?[4];
private TextPresenter? _currentActivePresenter; private TextPresenter? _currentActivePresenter;
public static readonly StyledProperty<IPAddress?> IPAddressProperty = AvaloniaProperty.Register<IPv4Box, IPAddress?>( public static readonly StyledProperty<IPAddress?> IPAddressProperty = AvaloniaProperty.Register<IPv4Box, IPAddress?>(
nameof(IPAddress)); nameof(IPAddress));
public IPAddress? IPAddress public IPAddress? IPAddress
@@ -220,7 +221,7 @@ public class IPv4Box: TemplatedControl
if (e.Handled) return; if (e.Handled) return;
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 (_currentActivePresenter != null) if (_currentActivePresenter != null)
{ {
int index = _currentActivePresenter.CaretIndex; int index = _currentActivePresenter.CaretIndex;
@@ -236,7 +237,7 @@ public class IPv4Box: TemplatedControl
_currentActivePresenter.ClearSelection(); _currentActivePresenter.ClearSelection();
oldText = _currentActivePresenter.Text; oldText = _currentActivePresenter.Text;
string? newText = string.IsNullOrEmpty(oldText) string newText = string.IsNullOrEmpty(oldText)
? s ? s
: oldText?.Substring(0, index) + s + oldText?.Substring(Math.Min(index, oldText.Length)); : oldText?.Substring(0, index) + s + oldText?.Substring(Math.Min(index, oldText.Length));
if (newText.Length > 3) if (newText.Length > 3)
@@ -262,8 +263,6 @@ public class IPv4Box: TemplatedControl
protected override void OnPointerPressed(PointerPressedEventArgs e) protected override void OnPointerPressed(PointerPressedEventArgs e)
{ {
var source = e.Source;
PointerPoint? clickInfo = e.GetCurrentPoint(this);
Point position = e.GetPosition(_firstText); Point position = e.GetPosition(_firstText);
foreach (var presenter in _presenters) foreach (var presenter in _presenters)
{ {
@@ -271,10 +270,10 @@ public class IPv4Box: TemplatedControl
{ {
if (e.ClickCount == 1) if (e.ClickCount == 1)
{ {
presenter?.ShowCaret(); presenter.ShowCaret();
_currentActivePresenter = presenter; _currentActivePresenter = presenter;
var caretPosition = position.WithX(position.X - presenter?.Bounds.X ?? 0); var caretPosition = position.WithX(position.X - presenter.Bounds.X);
presenter?.MoveCaretToPoint(caretPosition); presenter.MoveCaretToPoint(caretPosition);
} }
else if (e.ClickCount == 2) else if (e.ClickCount == 2)
{ {
@@ -402,7 +401,7 @@ public class IPv4Box: TemplatedControl
} }
IPAddress = null; IPAddress = null;
} }
private void SetIPAddress() private void SetIPAddress()
{ {
if (_firstByte is null && _secondByte is null && _thirdByte is null && _fourthByte is null) if (_firstByte is null && _secondByte is null && _thirdByte is null && _fourthByte is null)