From 0494cc4ce7df3a3dda421f50cadaea481cc360e2 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:43:50 +0800
Subject: [PATCH] adjust group style

---
 v2rayN/v2rayN/App.xaml                | 6 ++++++
 v2rayN/v2rayN/Resx/ResUI.Designer.cs  | 2 +-
 v2rayN/v2rayN/Resx/ResUI.resx         | 2 +-
 v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx | 2 +-
 v2rayN/v2rayN/Views/MainWindow.xaml   | 7 ++++---
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 6839b15d..74fd196b 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -135,6 +135,12 @@
                 TargetType="{x:Type GroupBox}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
+            <Style
+                x:Key="MyChipListBoxItem"
+                BasedOn="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBoxItem}"
+                TargetType="{x:Type ListBoxItem}">
+                <Setter Property="Margin" Value="-4,0" />
+            </Style>
 
 
         </ResourceDictionary>
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index 43e66e4c..b951e8e2 100644
--- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs
+++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
@@ -70,7 +70,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 All servers 的本地化字符串。
+        ///   查找类似 All 的本地化字符串。
         /// </summary>
         public static string AllGroupServers {
             get {
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 95cd3332..ad901893 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -449,7 +449,7 @@
     <value>Ungrouped</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
-    <value>All servers</value>
+    <value>All</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
index 07f4c454..6dd3d987 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -449,7 +449,7 @@
     <value>未分组服务器</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
-    <value>所有服务器</value>
+    <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>请浏览导入服务器配置</value>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index dfd71a79..35449ba2 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -342,6 +342,7 @@
                         <ListBox
                             x:Name="lstGroup"
                             FontSize="{DynamicResource StdFontSize}"
+                            ItemContainerStyle="{StaticResource MyChipListBoxItem}"
                             Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
@@ -353,15 +354,15 @@
                             x:Name="btnAddSub"
                             Width="30"
                             Height="30"
-                            Margin="8,0"
+                            Margin="4,0"
                             Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
                             <materialDesign:PackIcon Kind="Plus" />
                         </Button>
                         <Separator />
                         <TextBox
                             x:Name="txtServerFilter"
-                            Width="200"
-                            Margin="8,0"
+                            Width="100"
+                            Margin="4,0"
                             materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
                             materialDesign:TextFieldAssist.HasClearButton="True"
                             Style="{StaticResource DefTextBox}" />