From 6c29598071feb2b47925cce2c0a23d271d08e4fb Mon Sep 17 00:00:00 2001
From: Deadpikle <mbabienco@southern.edu>
Date: Tue, 17 Mar 2020 17:12:08 -0400
Subject: [PATCH] Fix clicking TextBox border moving to end Twofold fix: 1)
 Cursor doesn't show IBeam when not in DockPanel 2) If you do click the
 border, it just focuses the text box -- it does not move the selection

---
 src/Avalonia.Controls/TextBox.cs         | 3 ++-
 src/Avalonia.Themes.Default/TextBox.xaml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 4acfb75cb9..52b6a3c041 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -701,7 +701,8 @@ namespace Avalonia.Controls
         {
             var text = Text;
 
-            if (text != null && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+            var clickInfo = e.GetCurrentPoint(this);
+            if (text != null && clickInfo.Properties.IsLeftButtonPressed && !(clickInfo.Pointer?.Captured is Border))
             {
                 var point = e.GetPosition(_presenter);
                 var index = CaretIndex = _presenter.GetCaretIndex(point);
diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index 2c4cafde26..4fb3653e89 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -69,7 +69,7 @@
   <Style Selector="TextBox:error /template/ Border#border">
     <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}"/>
   </Style>
-  <Style Selector="TextBox">
+  <Style Selector="TextBox /template/ DockPanel">
     <Setter Property="Cursor" Value="IBeam" />
   </Style>
     <Style Selector="TextBox:disabled /template/ Border#border">