From 4e73b3ae28eb85c10daa940a1d2fb0a11c68fed6 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 25 Mar 2023 17:50:32 +0800
Subject: [PATCH] Adjust some style

---
 v2rayN/v2rayN/Tool/Utils.cs                        | 2 +-
 v2rayN/v2rayN/Views/AddServer2Window.xaml          | 2 +-
 v2rayN/v2rayN/Views/AddServerWindow.xaml           | 6 +++---
 v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml | 2 +-
 v2rayN/v2rayN/Views/MainWindow.xaml                | 9 +++++----
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml       | 6 +++---
 v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml  | 2 +-
 v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml  | 2 +-
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml      | 2 +-
 v2rayN/v2rayN/Views/SubEditWindow.xaml             | 2 +-
 10 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs
index b3c97c45..fc6b27d1 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -867,7 +867,7 @@ namespace v2rayN
                 string location = GetExePath();
                 if (blFull)
                 {
-                    return string.Format("v2rayN - V{0} - {1}-Test",
+                    return string.Format("v2rayN - V{0} - {1}",
                             FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
                             File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
                 }
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index a8985e19..c8ce3cb5 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -176,7 +176,7 @@
 
             <Grid
                 Grid.Row="1"
-                Margin="16"
+                Margin="8"
                 HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="200" />
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 991e62a0..f5d799f8 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -10,8 +10,8 @@
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"
-    Width="800"
-    Height="830"
+    Width="820"
+    Height="820"
     x:TypeArguments="vms:AddServerViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@@ -742,7 +742,7 @@
 
             <Grid
                 Grid.Row="9"
-                Margin="16"
+                Margin="8"
                 HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="200" />
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 6c69078a..d976011e 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -150,7 +150,7 @@
 
             <Grid
                 Grid.Row="2"
-                Margin="16"
+                Margin="8"
                 HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="150" />
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index c54166b1..4cd9fa83 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -15,8 +15,8 @@
     Title="v2rayN"
     Width="900"
     Height="700"
-    MinWidth="800"
-    MinHeight="600"
+    MinWidth="900"
+    MinHeight="700"
     x:TypeArguments="vms:MainWindowViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@@ -837,9 +837,10 @@
                         Height="Auto"
                         Background="{DynamicResource MaterialDesignLightBackground}"
                         BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
-                        BorderThickness="1">
+                        BorderThickness="0"
+                        CornerRadius="4">
                         <TextBlock
-                            Margin="2"
+                            Margin="8"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Foreground="{DynamicResource MaterialDesignDarkBackground}"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 8bd03808..7565ca7c 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -23,7 +23,7 @@
     TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <DockPanel Margin="16">
+    <DockPanel Margin="8">
         <Grid HorizontalAlignment="Center" DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="200" />
@@ -753,14 +753,14 @@
                             Width="300"
                             Margin="{StaticResource SettingItemMargin}"
                             Style="{StaticResource DefComboBox}" />
-                        
+
                         <TextBlock
                             Grid.Row="18"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsEnableHWA}"/>
+                            Text="{x:Static resx:ResUI.TbSettingsEnableHWA}" />
                         <ToggleButton
                             x:Name="togEnableHWA"
                             Grid.Row="18"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index e52037cb..86e0f727 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -134,7 +134,7 @@
         </Grid>
 
         <Grid
-            Margin="16"
+            Margin="8"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 9709fc1c..65de2f3f 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -73,7 +73,7 @@
         </ToolBarTray>
 
         <Grid
-            Margin="16"
+            Margin="8"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index c40e1d64..54f0f7ae 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -114,7 +114,7 @@
         </ToolBarTray>
 
         <Grid
-            Margin="16"
+            Margin="8"
             HorizontalAlignment="Center"
             DockPanel.Dock="Bottom">
             <Grid.ColumnDefinitions>
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index b6dd2312..022759d0 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -162,7 +162,7 @@
             </Grid>
             <Grid
                 Grid.Row="1"
-                Margin="16"
+                Margin="8"
                 HorizontalAlignment="Center">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="200" />