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

feat: try to fix re-focus issue.

Browse Source
This commit is contained in:
Dong Bin
2025-01-13 15:02:23 +08:00
parent a3d14e5a31
commit 5f5b08c1aa
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,15 +281,9 @@ public class IPv4Box: TemplatedControl
{ {
if (presenter?.Bounds.Contains(position)??false) if (presenter?.Bounds.Contains(position)??false)
{ {
_imClient.SetPresenter(presenter, this);
RaiseEvent(new TextInputMethodClientRequestedEventArgs()
{
Source = presenter,
Client = _imClient,
RoutedEvent = InputElement.TextInputMethodClientRequestedEvent,
});
if (e.ClickCount == 1) if (e.ClickCount == 1)
{ {
_imClient.SetPresenter(presenter);
presenter.ShowCaret(); presenter.ShowCaret();
_currentActivePresenter = presenter; _currentActivePresenter = presenter;
var caretPosition = position.WithX(position.X - presenter.Bounds.X); var caretPosition = position.WithX(position.X - presenter.Bounds.X);

15
src/Ursa/Controls/IPv4Box/IPv4BoxInputMethodClient.cs
View File

@@ -18,21 +18,8 @@ public class IPv4BoxInputMethodClient:TextInputMethodClient
public override Rect CursorRectangle { get; } public override Rect CursorRectangle { get; }
public override TextSelection Selection { get; set; } public override TextSelection Selection { get; set; }
private IPv4Box? _parent; private IPv4Box? _parent;
public void SetPresenter(TextPresenter? presenter, IPv4Box? parent) public void SetPresenter(TextPresenter? presenter)
{ {
if (this._parent != null)
this._parent.PropertyChanged -= new EventHandler<AvaloniaPropertyChangedEventArgs>(this.OnParentPropertyChanged);
this._parent = parent;
if (this._parent != null)
this._parent.PropertyChanged += new EventHandler<AvaloniaPropertyChangedEventArgs>(this.OnParentPropertyChanged);
TextPresenter presenter1 = this._presenter;
if (presenter1 != null)
{
presenter1.CaretBoundsChanged -= (EventHandler) ((s, e) => this.RaiseCursorRectangleChanged());
}
this._presenter = presenter;
if (this._presenter != null)
this._presenter.CaretBoundsChanged += (EventHandler) ((s, e) => this.RaiseCursorRectangleChanged());
this.RaiseTextViewVisualChanged(); this.RaiseTextViewVisualChanged();
this.RaiseCursorRectangleChanged(); this.RaiseCursorRectangleChanged();
} }