From 3b302006fdd1eae03bf3460e40f2f5a9f6852e23 Mon Sep 17 00:00:00 2001 From: Andrey Kunchev Date: Tue, 9 Oct 2018 14:48:02 +0300 Subject: [PATCH] fix failing text e.g. restore carretIndex in textbox when text changed --- src/Avalonia.Controls/TextBox.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs index f8f0667759..2f29d229e5 100644 --- a/src/Avalonia.Controls/TextBox.cs +++ b/src/Avalonia.Controls/TextBox.cs @@ -212,9 +212,10 @@ namespace Avalonia.Controls { if (!_ignoreTextChanges) { - CaretIndex = CoerceCaretIndex(CaretIndex, value?.Length ?? 0); + var carretIndex = CaretIndex; SelectionStart = CoerceCaretIndex(SelectionStart, value?.Length ?? 0); SelectionEnd = CoerceCaretIndex(SelectionEnd, value?.Length ?? 0); + CaretIndex = CoerceCaretIndex(carretIndex, value?.Length ?? 0); if (SetAndRaise(TextProperty, ref _text, value) && !_isUndoingRedoing) {