From cf3bdf8507f86a8e5d6d4c6f9818c42feef3d82c Mon Sep 17 00:00:00 2001
From: Rayyan Tahir <rayyantahir2010@hotmail.com>
Date: Tue, 3 Jul 2018 17:31:44 +0500
Subject: [PATCH 1/4] When TextBox IsReadOnly property is true, no need to show
 caret.

---
 samples/ControlCatalog/Pages/TextBoxPage.xaml | 1 +
 src/Avalonia.Controls/TextBox.cs              | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index fb0d8fb7b1..96c1665afe 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -9,6 +9,7 @@
               Gap="16">
       <StackPanel Orientation="Vertical" Gap="8">
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
+        <TextBox Watermark="ReadOnly" IsReadOnly="True"/>
         <TextBox Width="200" Watermark="Watermark" />
         <TextBox Width="200"
                  Watermark="Floating Watermark"
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 2ea9319194..a4c6a6cdf7 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -282,7 +282,10 @@ namespace Avalonia.Controls
             }
             else
             {
-                _presenter?.ShowCaret();
+                if (!IsReadOnly)
+                    _presenter?.ShowCaret();
+                else
+                    _presenter?.HideCaret();
             }
 
             e.Handled = true;

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 2/4] 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);

From 387de6a3f70e3eb87256b29d0ccc4d94555d126d Mon Sep 17 00:00:00 2001
From: "rayyantahir2010@hotmail.com" <sannan@clarybusinessmachines.com>
Date: Wed, 4 Jul 2018 12:29:08 +0500
Subject: [PATCH 3/4] Fix build failure

---
 src/Avalonia.Controls/TextBox.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index ec32326cd9..f5900f99e4 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -124,7 +124,7 @@ namespace Avalonia.Controls
                 ScrollViewer.HorizontalScrollBarVisibilityProperty,
                 horizontalScrollBarVisibility,
                 BindingPriority.Style);
-            _undoRedoHelper = new UndoRedoHelper<UndoRedoState>(this);            
+            _undoRedoHelper = new UndoRedoHelper<UndoRedoState>(this);
         }
 
         public bool AcceptsReturn
@@ -290,7 +290,7 @@ namespace Avalonia.Controls
 
         private void DecideCaretVisibility()
         {
-            if (!IsReadOnly || IsReadOnlyCaretVisible)
+            if (!IsReadOnly)
                 _presenter?.ShowCaret();
             else
                 _presenter?.HideCaret();

From 33172127cc04025fb4e6e567d357706a68b367d2 Mon Sep 17 00:00:00 2001
From: "rayyantahir2010@hotmail.com" <=>
Date: Wed, 4 Jul 2018 12:54:54 +0500
Subject: [PATCH 4/4] Added the ability to copy from a readonly textbox

---
 samples/ControlCatalog/Pages/TextBoxPage.xaml     | 2 +-
 src/Avalonia.Controls/Presenters/TextPresenter.cs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 96c1665afe..a717518655 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -9,7 +9,7 @@
               Gap="16">
       <StackPanel Orientation="Vertical" Gap="8">
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." Width="200" />
-        <TextBox Watermark="ReadOnly" IsReadOnly="True"/>
+        <TextBox Watermark="ReadOnly" IsReadOnly="True" Text="This is read only"/>
         <TextBox Width="200" Watermark="Watermark" />
         <TextBox Width="200"
                  Watermark="Floating Watermark"
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index bda660be51..636c836da5 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -189,6 +189,12 @@ namespace Avalonia.Controls.Presenters
                     _caretTimer.Start();
                     InvalidateVisual();
                 }
+                else
+                {
+                    _caretTimer.Start();
+                    InvalidateVisual();
+                    _caretTimer.Stop();
+                }
 
                 if (IsMeasureValid)
                 {