From 9a3ed2e0228c5d12c773de632805bbf6f944df50 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Sun, 14 May 2023 01:51:44 -0400
Subject: [PATCH] Use correct theme specific selection brush on
 SelectableTextBlock

---
 samples/ControlCatalog/Pages/TextBlockPage.xaml              | 2 +-
 src/Avalonia.Controls/SelectableTextBlock.cs                 | 2 +-
 src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml | 2 ++
 src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/TextBlockPage.xaml b/samples/ControlCatalog/Pages/TextBlockPage.xaml
index 6511e2136a..70f83f6799 100644
--- a/samples/ControlCatalog/Pages/TextBlockPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBlockPage.xaml
@@ -118,7 +118,7 @@
         </StackPanel>
       </Border>
       <Border>
-        <SelectableTextBlock SelectionBrush="LightBlue" Margin="10" TextWrapping="Wrap">
+        <SelectableTextBlock Margin="10" TextWrapping="Wrap">
           This <Span FontWeight="Bold">is</Span> a
           <Span Background="Silver" Foreground="Maroon">TextBlock</Span>
           with <Span TextDecorations="Underline">several</Span>
diff --git a/src/Avalonia.Controls/SelectableTextBlock.cs b/src/Avalonia.Controls/SelectableTextBlock.cs
index 5d14611a62..830c0a671d 100644
--- a/src/Avalonia.Controls/SelectableTextBlock.cs
+++ b/src/Avalonia.Controls/SelectableTextBlock.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Controls
                 o => o.SelectedText);
 
         public static readonly StyledProperty<IBrush?> SelectionBrushProperty =
-            TextBox.SelectionBrushProperty.AddOwner<SelectableTextBlock>(new(new Data.Optional<IBrush?>(Brushes.Blue)));
+            TextBox.SelectionBrushProperty.AddOwner<SelectableTextBlock>();
 
         public static readonly DirectProperty<SelectableTextBlock, bool> CanCopyProperty =
             TextBox.CanCopyProperty.AddOwner<SelectableTextBlock>(o => o.CanCopy);
diff --git a/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml b/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml
index f630969ae6..2556f80ef6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SelectableTextBlock.xaml
@@ -10,6 +10,8 @@
   </MenuFlyout>
 
   <ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock">
+    <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
+
     <Style Selector="^[IsEnabled=True]">
       <Setter Property="Cursor" Value="IBeam" />
       <Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml b/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml
index aaa6448aea..e504a8cf8e 100644
--- a/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SelectableTextBlock.xaml
@@ -10,6 +10,8 @@
   </MenuFlyout>
 
   <ControlTheme x:Key="{x:Type SelectableTextBlock}" TargetType="SelectableTextBlock">
+    <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}" />
+
     <Style Selector="^[IsEnabled=True]">
       <Setter Property="Cursor" Value="IBeam" />
       <Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />