From 06dbc915839a3161ebeb7e4e4da93b48f3f59a53 Mon Sep 17 00:00:00 2001
From: "rayyantahir2010@hotmail.com" <sannan@clarybusinessmachines.com>
Date: Wed, 4 Jul 2018 12:11:57 +0500
Subject: [PATCH] Moved caret visibility decision to helper method and called
 that method in OnTemplateApplied also

---
 src/Avalonia.Controls/TextBox.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index a4c6a6cdf7..ec32326cd9 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -262,7 +262,7 @@ namespace Avalonia.Controls
 
             if (IsFocused)
             {
-                _presenter.ShowCaret();
+                DecideCaretVisibility();
             }
         }
 
@@ -282,15 +282,20 @@ namespace Avalonia.Controls
             }
             else
             {
-                if (!IsReadOnly)
-                    _presenter?.ShowCaret();
-                else
-                    _presenter?.HideCaret();
+                DecideCaretVisibility();
             }
 
             e.Handled = true;
         }
 
+        private void DecideCaretVisibility()
+        {
+            if (!IsReadOnly || IsReadOnlyCaretVisible)
+                _presenter?.ShowCaret();
+            else
+                _presenter?.HideCaret();
+        }
+
         protected override void OnLostFocus(RoutedEventArgs e)
         {
             base.OnLostFocus(e);