From 080d660cfaf54379e6652fa1f9c3954197bc47d9 Mon Sep 17 00:00:00 2001
From: Metatron <panruzun@gmail.com>
Date: Mon, 3 Apr 2023 10:45:21 +0800
Subject: [PATCH 1/3] Select row background change

---
 .../v2rayN/ViewModels/MainWindowViewModel.cs  |  9 +++------
 v2rayN/v2rayN/Views/MainWindow.xaml           | 19 ++++++++-----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 86255d79..e915a2a7 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -563,8 +563,8 @@ namespace v2rayN.ViewModels
                     {
                         return;
                     }
-                    SpeedProxyDisplay = string.Format("{0}:{1}/s¡ü | {2}/s¡ý", Global.agentTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
-                    SpeedDirectDisplay = string.Format("{0}:{1}/s¡ü | {2}/s¡ý", Global.directTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
+                    SpeedProxyDisplay = string.Format("{0}:{1}/s�� | {2}/s��", Global.agentTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
+                    SpeedDirectDisplay = string.Format("{0}:{1}/s�� | {2}/s��", Global.directTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
 
                     if (update.proxyUp + update.proxyDown > 0)
                     {
@@ -1068,10 +1068,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (!_dicHeaderSort.ContainsKey(colName))
-            {
-                _dicHeaderSort.Add(colName, true);
-            }
+            _dicHeaderSort.TryAdd(colName, true);
             _dicHeaderSort.TryGetValue(colName, out bool asc);
             if (ConfigHandler.SortServers(ref _config, _subId, colName, asc) != 0)
             {
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 4cd9fa83..3c1c8f67 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -615,19 +615,16 @@
                             <Style BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}" TargetType="DataGridColumnHeader">
                                 <EventSetter Event="Click" Handler="LstProfiles_ColumnHeader_Click" />
                             </Style>
+                            
+                            <Style TargetType="DataGridCell">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="isActive" Value="True">
+                                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
                         </DataGrid.Resources>
                         <DataGrid.Columns>
-                            <DataGridTemplateColumn Width="40">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <Border
-                                            Width="auto"
-                                            Height="auto"
-                                            Background="{DynamicResource PrimaryHueLightBrush}"
-                                            Visibility="{Binding Path=isActive, Converter={StaticResource BoolToVisConverter}}" />
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
 
                             <base:MyDGTextColumn
                                 Width="80"

From 5f40e6e0b704d9684594a48eb366496dbb3f32d0 Mon Sep 17 00:00:00 2001
From: Metatron <panruzun@gmail.com>
Date: Mon, 3 Apr 2023 10:50:56 +0800
Subject: [PATCH 2/3] fix

---
 v2rayN/v2rayN/Views/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 3c1c8f67..ff58aa0b 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -618,7 +618,7 @@
                             
                             <Style TargetType="DataGridCell">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="isActive" Value="True">
+                                    <DataTrigger Binding="{Binding isActive}" Value="True">
                                         <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
                                     </DataTrigger>
                                 </Style.Triggers>

From 4b5508fc3cbf3dd80e554b876ad4d1185bd33f5a Mon Sep 17 00:00:00 2001
From: Metatron <panruzun@gmail.com>
Date: Mon, 3 Apr 2023 14:43:30 +0800
Subject: [PATCH 3/3] Style change

---
 v2rayN/v2rayN/Views/MainWindow.xaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index ff58aa0b..b19292ab 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -616,13 +616,15 @@
                                 <EventSetter Event="Click" Handler="LstProfiles_ColumnHeader_Click" />
                             </Style>
                             
-                            <Style TargetType="DataGridCell">
+                            <Style TargetType="DataGridCell" BasedOn="{StaticResource MaterialDesignDataGridCell}">
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding isActive}" Value="True">
                                         <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
+                                        <Setter Property="Foreground" Value="Black"></Setter>
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
+                            
                         </DataGrid.Resources>
                         <DataGrid.Columns>