From 81ebf0cdf152ad6b172ca17f17e8c014c7712c4f Mon Sep 17 00:00:00 2001
From: ZCShou <72115@163.com>
Date: Thu, 8 Apr 2021 09:52:53 +0800
Subject: [PATCH] =?UTF-8?q?fix<DataGrid>:=E4=BF=AE=E5=A4=8D=20DataGrid=20?=
 =?UTF-8?q?=E5=9C=A8=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E9=A2=9C=E8=89=B2=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=8E=B0=E5=9C=A8=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E5=90=8E=E4=BB=8D?=
 =?UTF-8?q?=E7=84=B6=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Resources/Styles/DataGrid.xaml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Styles/DataGrid.xaml b/src/Resources/Styles/DataGrid.xaml
index cf4f42d7..32ba8ae6 100644
--- a/src/Resources/Styles/DataGrid.xaml
+++ b/src/Resources/Styles/DataGrid.xaml
@@ -3,6 +3,22 @@
 
     <Style x:Key="Style.DataGridCell" TargetType="{x:Type DataGridCell}">
         <Setter Property="BorderThickness" Value="0"/>
+        <Style.Triggers>
+            <Trigger  Property="IsSelected" Value="true">
+                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            </Trigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="True" />
+                    <Condition Binding="{Binding IsKeyboardFocusWithin, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}, Mode=FindAncestor}}" Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            </MultiDataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style x:Key="Style.DataGridRow" TargetType="{x:Type DataGridRow}">
@@ -14,12 +30,8 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    
+
     <Style TargetType="{x:Type DataGrid}">
-        <Style.Resources>
-            <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="{x:Static SystemColors.HighlightColor}"/>
-        </Style.Resources>
-        
         <Setter Property="IsReadOnly" Value="True"/>
         <Setter Property="AutoGenerateColumns" Value="False"/>
         <Setter Property="CanUserAddRows" Value="False"/>