From 7cf208208b2095d4af2c65df6a4256804fcfd259 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 8 Jan 2017 02:13:11 +0100 Subject: [PATCH] Don't show TextBox caret when control not focused. Fixes #836. --- src/Avalonia.Controls/Presenters/TextPresenter.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs index d3cf4e5509..39759f78f1 100644 --- a/src/Avalonia.Controls/Presenters/TextPresenter.cs +++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs @@ -173,10 +173,13 @@ namespace Avalonia.Controls.Presenters { if (this.GetVisualParent() != null) { - _caretBlink = true; - _caretTimer.Stop(); - _caretTimer.Start(); - InvalidateVisual(); + if (_caretTimer.IsEnabled) + { + _caretBlink = true; + _caretTimer.Stop(); + _caretTimer.Start(); + InvalidateVisual(); + } if (IsMeasureValid) {