From 8d335a749167e81750d96280250e1e8136191fbe Mon Sep 17 00:00:00 2001
From: fonaix <fonaix@qq.com>
Date: Thu, 21 Nov 2024 22:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=8F=E6=96=87=E5=AD=97=E8=BF=87=E5=A4=A7=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2rayN.Desktop/Views/StatusBarView.axaml  | 121 ++++++++----------
 1 file changed, 53 insertions(+), 68 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
index 9d3b99f5..d07510cd 100644
--- a/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml
@@ -10,76 +10,61 @@
     d:DesignWidth="800"
     x:DataType="vms:StatusBarViewModel"
     mc:Ignorable="d">
-    <Grid>
-        <StackPanel Height="50">
-            <DockPanel>
-                <StackPanel
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right">
-                    <TextBlock x:Name="txtSpeedProxyDisplay" />
-                    <Border Margin="2" />
-                    <TextBlock x:Name="txtSpeedDirectDisplay" />
-                </StackPanel>
+	<Grid>
+		<StackPanel Margin="0,5" Orientation="Horizontal">
+			<StackPanel
+				VerticalAlignment="Center">
+				<TextBlock x:Name="txtSpeedProxyDisplay" />
+				<Border Margin="2" />
+				<TextBlock x:Name="txtSpeedDirectDisplay" />
+			</StackPanel>
 
-                <StackPanel
-                    Width="240"
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left">
-                    <TextBlock x:Name="txtInboundDisplay" />
-                    <Border Margin="2" />
-                    <TextBlock x:Name="txtInboundLanDisplay" />
-                </StackPanel>
+			<StackPanel
+				Margin="8,0"
+				VerticalAlignment="Center">
+				<TextBlock x:Name="txtInboundDisplay" />
+				<Border Margin="2" />
+				<TextBlock x:Name="txtInboundLanDisplay" />
+			</StackPanel>
 
-                <StackPanel
-                    x:Name="spEnableTun"
-                    Width="100"
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Orientation="Horizontal">
-                    <TextBlock
-                        Margin="8,0"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbEnableTunAs}" />
-                    <ToggleSwitch
-                        x:Name="togEnableTun"
-                        HorizontalAlignment="Center"
-                        Classes="Margin8"
-                        Theme="{StaticResource SimpleToggleSwitch}" />
-                </StackPanel>
+			<StackPanel
+				x:Name="spEnableTun"
+				VerticalAlignment="Center"
+				Orientation="Horizontal">
+				<TextBlock
+					VerticalAlignment="Center"
+					Text="{x:Static resx:ResUI.TbEnableTunAs}" />
+				<ToggleSwitch
+					x:Name="togEnableTun"
+					HorizontalAlignment="Center"
+					Theme="{StaticResource SimpleToggleSwitch}" />
+			</StackPanel>
+			
+			<StackPanel
+				Margin="8,0"
+				VerticalAlignment="Center"
+				Orientation="Horizontal">
+				<ComboBox
+					x:Name="cmbSystemProxy"
+					ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
+					<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
+					<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
+					<ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
+				</ComboBox>
 
-                <StackPanel
-                    Margin="8,0"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Orientation="Horizontal">
-                    <ComboBox
-                        x:Name="cmbSystemProxy"
-                        Width="160"
-                        Margin="8,0"
-                        ToolTip.Tip="{x:Static resx:ResUI.menuSystemproxy}">
-                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
-                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxySet}" />
-                        <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyNothing}" />
-                    </ComboBox>
+				<ComboBox
+					x:Name="cmbRoutings2"
+					Margin="8,0,0,0"
+					DisplayMemberBinding="{Binding Remarks}"
+					ItemsSource="{Binding RoutingItems}"
+					ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
+			</StackPanel>
 
-                    <ComboBox
-                        x:Name="cmbRoutings2"
-                        Width="160"
-                        Margin="8,0"
-                        DisplayMemberBinding="{Binding Remarks}"
-                        ItemsSource="{Binding RoutingItems}"
-                        ToolTip.Tip="{x:Static resx:ResUI.menuRouting}" />
-                </StackPanel>
-
-                <StackPanel Margin="8,0" VerticalAlignment="Center">
-                    <TextBlock x:Name="txtRunningServerDisplay" />
-                    <Border Margin="2" />
-                    <TextBlock x:Name="txtRunningInfoDisplay" />
-                </StackPanel>
-            </DockPanel>
-        </StackPanel>
-    </Grid>
+			<StackPanel VerticalAlignment="Center">
+				<TextBlock x:Name="txtRunningServerDisplay" />
+				<Border Margin="2" />
+				<TextBlock x:Name="txtRunningInfoDisplay" />
+			</StackPanel>
+		</StackPanel>
+	</Grid>
 </UserControl>
\ No newline at end of file