@@ -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);
@@ -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 Selector="TextBox:disabled /template/ Border#border">