Fix EndOfLine navigation

5 years ago · 3c8a7a9b8e
1 changed files with 5 additions and 2 deletions
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@ -1322,12 +1322,15 @@ namespace Avalonia.Controls
                var lineIndex = _presenter.TextLayout.GetLineIndexFromCharacterIndex(caretIndex, true);
                var textLine = textLines[lineIndex];
                
-                if (caretIndex == textLine.TextRange.Start + textLine.TextRange.Length && lineIndex + 1 < textLines.Count)
+                if (caretIndex == textLine.TextRange.Start + textLine.TextRange.Length  - textLine.NewLineLength &&
+                    lineIndex + 1 < textLines.Count)
                {
                    textLine = textLines[++lineIndex];
                }

-                _presenter.MoveCaretToTextPosition(textLine.TextRange.Start + textLine.TextRange.Length, true);
+                var textPosition = textLine.TextRange.Start + textLine.TextRange.Length - textLine.NewLineLength;
+
+                _presenter.MoveCaretToTextPosition(textPosition, true);
            }
        }