From e43311bd468351856a0ad2de301833dfbd068277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Mutnia=C5=84ski?=
 <45796706+RobertMut@users.noreply.github.com>
Date: Mon, 20 Nov 2023 20:48:58 +0100
Subject: [PATCH] Fix #13249 Mouse cursor on TextBox scrollbars shows as caret
 (#13542)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add styles to scrollviewers

* pr comment fix

* remove styles from scrollviewer

* add styles to scrollviewers

* add Ibeam to floating watermark

---------

Co-authored-by: Robert Mutniański <robert.mutnianski@inetum.com>
---
 src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml |  4 ++--
 src/Avalonia.Themes.Fluent/Controls/TextBox.xaml      | 10 +++++++++-
 src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml |  2 +-
 src/Avalonia.Themes.Simple/Controls/TextBox.xaml      |  8 ++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
index 886a903a43..a552f80781 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
@@ -44,10 +44,10 @@
           </ScrollContentPresenter>
           <ScrollBar Name="PART_HorizontalScrollBar"
                      Orientation="Horizontal"
-                     Grid.Row="1" />
+                     Grid.Row="1"/>
           <ScrollBar Name="PART_VerticalScrollBar"
                      Orientation="Vertical"
-                     Grid.Column="1" />
+                     Grid.Column="1"/>
           <Panel x:Name="PART_ScrollBarsSeparator"
                  Grid.Row="1"
                  Grid.Column="1"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index e7704ee4e5..3d2d33919c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -131,7 +131,6 @@
                 <DockPanel x:Name="PART_InnerDockPanel"
                            Grid.Column="1"
                            Grid.ColumnSpan="1"
-                           Cursor="IBeam"
                            Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
                              Foreground="{DynamicResource SystemAccentColor}"
@@ -171,6 +170,11 @@
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     </Panel>
+                    <ScrollViewer.Styles>
+                      <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                        <Setter Property="Cursor" Value="IBeam" />
+                      </Style>
+                    </ScrollViewer.Styles>
                   </ScrollViewer>
                 </DockPanel>
                 <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>
@@ -228,6 +232,10 @@
       <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
     </Style>
 
+    <Style Selector="^ /template/ TextBlock#PART_FloatingWatermark">
+      <Setter Property="Cursor" Value="IBeam"/>
+    </Style>
+    
     <Style Selector="^[UseFloatingWatermark=true]:not(:empty) /template/ TextBlock#PART_FloatingWatermark">
       <Setter Property="IsVisible" Value="True" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
index 2b36b118c3..ea62f757c5 100644
--- a/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ScrollViewer.xaml
@@ -31,7 +31,7 @@
                      Orientation="Vertical"/>
           <Panel Grid.Row="1"
                  Grid.Column="1"
-                 Background="{DynamicResource ThemeControlMidBrush}" />
+                 Background="{DynamicResource ThemeControlMidBrush}"/>
         </Grid>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 3f06a33dc1..16eaba5489 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -157,6 +157,11 @@
                                    TextAlignment="{TemplateBinding TextAlignment}"
                                    TextWrapping="{TemplateBinding TextWrapping}" />
                   </Panel>
+                  <ScrollViewer.Styles>
+                    <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                      <Setter Property="Cursor" Value="IBeam" />
+                    </Style>
+                  </ScrollViewer.Styles>
                 </ScrollViewer>
                 <ContentPresenter Grid.Column="2"
                                   Grid.ColumnSpan="1"
@@ -183,6 +188,9 @@
     <Style Selector="^:disabled /template/ Border#border">
       <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
+    <Style Selector="^ /template/ TextBlock#floatingWatermark">
+      <Setter Property="Cursor" Value="IBeam"/>
+    </Style>
 
     <Style Selector="^.clearButton[AcceptsReturn=False][IsReadOnly=False]:focus:not(TextBox:empty)">
       <Setter Property="InnerRightContent">