From 534f1ef961eada29a4edf913ff1fa112588c755c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 23 Dec 2021 23:06:23 +0800
Subject: [PATCH] enhance: add HighlightTextBrush prop for HighlightTextBlock

---
 .../HandyControl_Net_40/Themes/Theme.xaml     |  5 +++++
 .../UserControl/Main/LeftMainContent.xaml     |  2 +-
 .../Controls/Text/HighlightTextBlock.cs       | 22 ++++++++++++-------
 .../Styles/Base/TextBlockBaseStyle.xaml       |  6 +++++
 .../Themes/Styles/TextBlock.xaml              |  3 +++
 .../HandyControl_Shared/Themes/Theme.xaml     |  5 +++++
 6 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index a04e38c2..f925481d 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -1306,6 +1306,10 @@
 	<Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
 		<Setter Property="FontWeight" Value="Bold" />
 	</Style>
+	<Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
+		<Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}" />
+	</Style>
 	<Style x:Key="LabelBaseStyle" TargetType="Label">
 		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
@@ -3280,6 +3284,7 @@
 		<Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
 	</Style>
 	<Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
+	<Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
 	<Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="BorderThickness" Value="1" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index f72204a1..52fe0e9a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -52,7 +52,7 @@
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
                                         <Image Width="16" Height="16" Source="{Binding ImageName}"/>
-                                        <hc:HighlightTextBlock Margin="6,0,0,0" SourceText="{ex:Lang Key={Binding Name}}" QueriesText="{Binding QueriesText}" HighlightBrush="#f06632" />
+                                        <hc:HighlightTextBlock Margin="6,0,0,0" SourceText="{ex:Lang Key={Binding Name}}" QueriesText="{Binding QueriesText}"/>
                                         <Path Visibility="{Binding IsNew,Converter={StaticResource Boolean2VisibilityConverter}}" VerticalAlignment="Center" Data="{StaticResource NewGeometry}" Stretch="Uniform" Margin="10,0,0,0" Width="30" Height="14" Fill="{DynamicResource DangerBrush}"/>
                                     </StackPanel>
                                 </DataTemplate>
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs b/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
index 102d7763..a85b4862 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
@@ -21,8 +21,10 @@ namespace HandyControl.Controls
                 new PropertyMetadata(null, OnQueriesTextChanged));
 
         public static readonly DependencyProperty HighlightBrushProperty =
-            DependencyProperty.Register("HighlightBrush", typeof(Brush), typeof(HighlightTextBlock),
-                new PropertyMetadata(Brushes.Yellow));
+            DependencyProperty.Register("HighlightBrush", typeof(Brush), typeof(HighlightTextBlock));
+
+        public static readonly DependencyProperty HighlightTextBrushProperty =
+            DependencyProperty.Register("HighlightTextBrush", typeof(Brush), typeof(HighlightTextBlock));
 
         private static void OnSourceTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
             ((HighlightTextBlock) d).RefreshInlines();
@@ -64,6 +66,12 @@ namespace HandyControl.Controls
             set => SetValue(HighlightBrushProperty, value);
         }
 
+        public Brush HighlightTextBrush
+        {
+            get => (Brush) GetValue(HighlightTextBrushProperty);
+            set => SetValue(HighlightTextBrushProperty, value);
+        }
+
         private void RefreshInlines()
         {
             Inlines.Clear();
@@ -97,12 +105,10 @@ namespace HandyControl.Controls
         private Run GetHighlightRun(string highlightText)
         {
             var run = new Run(highlightText);
-            run.SetBinding(TextElement.BackgroundProperty, new Binding
-            {
-                Source = this,
-                Path = new PropertyPath(nameof(HighlightBrush)),
-                Mode = BindingMode.OneWay
-            });
+
+            run.SetBinding(TextElement.BackgroundProperty, new Binding(nameof(HighlightBrush)) { Source = this });
+            run.SetBinding(TextElement.ForegroundProperty, new Binding(nameof(HighlightTextBrush)) { Source = this });
+
             return run;
         }
 
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBlockBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBlockBaseStyle.xaml
index 050a5023..d6e9f655 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBlockBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBlockBaseStyle.xaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:hc="clr-namespace:HandyControl.Controls"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="TextBlockBaseStyle" TargetType="TextBlock">
@@ -11,4 +12,9 @@
         <Setter Property="FontWeight" Value="Bold"/>
     </Style>
 
+    <Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
+        <Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TextBlock.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TextBlock.xaml
index a1351cca..6dd2e4ed 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TextBlock.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TextBlock.xaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:hc="clr-namespace:HandyControl.Controls"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--默认样式-->
@@ -49,4 +50,6 @@
     </Style>
     <Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock"/>
 
+    <Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock"/>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 2945a9a8..3e3c1a5a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1306,6 +1306,10 @@
 	<Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
 		<Setter Property="FontWeight" Value="Bold" />
 	</Style>
+	<Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
+		<Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}" />
+	</Style>
 	<Style x:Key="LabelBaseStyle" TargetType="Label">
 		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
@@ -3280,6 +3284,7 @@
 		<Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
 	</Style>
 	<Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
+	<Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
 	<Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="BorderThickness" Value="1" />