Browse Source

Merge branch 'master' into feature/optional-clear-in-rendertargetbitmap-createdrawingcontext

pull/12793/head
Paisley Mahern 3 years ago
committed by GitHub
parent
commit
3c44afceab
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/Avalonia.Controls/Presenters/TextPresenter.cs

8
src/Avalonia.Controls/Presenters/TextPresenter.cs

@ -97,7 +97,6 @@ namespace Avalonia.Controls.Presenters
public TextPresenter() public TextPresenter()
{ {
_caretTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(500) }; _caretTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(500) };
_caretTimer.Tick += CaretTimerTick;
} }
public event EventHandler? CaretBoundsChanged; public event EventHandler? CaretBoundsChanged;
@ -814,6 +813,13 @@ namespace Avalonia.Controls.Presenters
return _caretBounds; return _caretBounds;
} }
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
_caretTimer.Tick += CaretTimerTick;
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{ {
base.OnDetachedFromVisualTree(e); base.OnDetachedFromVisualTree(e);

Loading…
Cancel
Save