Browse Source

Fix caret not displaying when focused via Tab key.

Also set caret position to end when selecting all, as textboxes when selected should scroll to display the end of the text.
Steven Kirk 5 years ago
parent
commit
7b1a9fbb84
1 changed files with 2 additions and 8 deletions
  1. 2 8
      src/Avalonia.Controls/TextBox.cs

+ 2 - 8
src/Avalonia.Controls/TextBox.cs

@@ -347,7 +347,7 @@ namespace Avalonia.Controls
 
             if (IsFocused)
             {
-                DecideCaretVisibility();
+                _presenter?.ShowCaret();
             }
         }
 
@@ -364,14 +364,7 @@ namespace Avalonia.Controls
             {
                 SelectAll();
             }
-            else
-            {
-                DecideCaretVisibility();
-            }
-        }
 
-        private void DecideCaretVisibility()
-        {
             _presenter?.ShowCaret();
         }
 
@@ -975,6 +968,7 @@ namespace Avalonia.Controls
         {
             SelectionStart = 0;
             SelectionEnd = Text?.Length ?? 0;
+            CaretIndex = SelectionEnd;
         }
 
         private bool DeleteSelection()