From 4f48e8b190c5ce266c7845635d39ab0ee00c541b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:23:46 +0800
Subject: [PATCH] Optimize UI

---
 v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml   | 10 +++++-----
 v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml |  2 +-
 v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml   |  2 --
 v2rayN/v2rayN/Views/StatusBarView.xaml            |  5 +++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml b/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
index bf7440e6..aaeec2c5 100644
--- a/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
+++ b/v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml
@@ -6,18 +6,18 @@
     </Design.PreviewWith>
 
     <Style Selector="TextBlock.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="StackPanel.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="DockPanel.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="WrapPanel.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="Grid.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
 </Styles>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
index 0138fe7a..0dca2926 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
@@ -50,7 +50,7 @@
                         <Border
                             Width="500"
                             Height="80"
-                            Margin="-2"
+                            Margin="-8"
                             VerticalAlignment="Center"
                             Theme="{StaticResource CardBorder}">
                             <Grid>
diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
index 1f9e9a56..af3a3545 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
@@ -23,7 +23,6 @@
                 </StackPanel>
 
                 <StackPanel
-                    Width="120"
                     Margin="8,0"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
@@ -34,7 +33,6 @@
 
                 <StackPanel
                     x:Name="spEnableTun"
-                    Width="100"
                     Margin="8,0"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left"
diff --git a/v2rayN/v2rayN/Views/StatusBarView.xaml b/v2rayN/v2rayN/Views/StatusBarView.xaml
index e6157f34..35644516 100644
--- a/v2rayN/v2rayN/Views/StatusBarView.xaml
+++ b/v2rayN/v2rayN/Views/StatusBarView.xaml
@@ -27,7 +27,7 @@
                 </StackPanel>
 
                 <StackPanel
-                    Width="120"
+                    Width="Auto"
                     Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
@@ -38,7 +38,7 @@
 
                 <StackPanel
                     x:Name="spEnableTun"
-                    Width="auto"
+                    Width="Auto"
                     Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left"
@@ -46,6 +46,7 @@
                     <TextBlock
                         Margin="{StaticResource MarginLeftRight8}"
                         VerticalAlignment="Center"
+                        Style="{StaticResource StatusbarItem}"
                         Text="{x:Static resx:ResUI.TbEnableTunAs}" />
                     <ToggleButton
                         x:Name="togEnableTun"