From b4f50258a7be834569804514d8210f292b0168a8 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:20:37 +0800
Subject: [PATCH] Fix style for desktop

---
 .../Views/ClashProxiesView.axaml               | 18 ++++++++++--------
 v2rayN/v2rayN.Desktop/Views/MainWindow.axaml   |  2 +-
 .../Views/OptionSettingWindow.axaml            |  4 ++--
 .../v2rayN.Desktop/Views/SubEditWindow.axaml   |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
index d03c864f..e37b5c4d 100644
--- a/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml
@@ -92,7 +92,6 @@
         <DockPanel>
             <ListBox
                 x:Name="lstProxyGroups"
-                Margin="0,0,5,0"
                 DockPanel.Dock="Left"
                 ItemsSource="{Binding ProxyGroups}">
                 <ItemsControl.ItemsPanel>
@@ -108,16 +107,17 @@
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>
-                                <Grid Grid.Column="0" Classes="Margin4">
+                                <Grid Grid.Column="0" Classes="Margin8">
                                     <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
+                                        <RowDefinition Height="1*" />
+                                        <RowDefinition Height="8" />
+                                        <RowDefinition Height="1*" />
                                     </Grid.RowDefinitions>
                                     <DockPanel Grid.Row="0">
                                         <TextBlock DockPanel.Dock="Right" Text="{Binding type}" />
                                         <TextBlock Text="{Binding name}" />
                                     </DockPanel>
-                                    <TextBlock Grid.Row="1" Text="{Binding now}" />
+                                    <TextBlock Grid.Row="2" Text="{Binding now}" />
                                 </Grid>
                             </DockPanel>
                         </Border>
@@ -141,6 +141,7 @@
                     <DataTemplate>
                         <Border
                             Width="160"
+                            Margin="0"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>
@@ -152,16 +153,17 @@
                                     CornerRadius="4"
                                     DockPanel.Dock="Left"
                                     IsVisible="{Binding isActive}" />
-                                <Grid Classes="Margin4">
+                                <Grid Classes="Margin8">
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="2*" />
+                                        <RowDefinition Height="1*" />
+                                        <RowDefinition Height="8" />
                                         <RowDefinition Height="1*" />
                                     </Grid.RowDefinitions>
                                     <TextBlock
                                         Grid.Row="0"
                                         Text="{Binding name}"
                                         TextWrapping="WrapWithOverflow" />
-                                    <DockPanel Grid.Row="1">
+                                    <DockPanel Grid.Row="2">
                                         <TextBlock
                                             DockPanel.Dock="Right"
                                             Foreground="{Binding Path=delay, Converter={StaticResource DelayColorConverter}}"
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
index 76eb5766..0f7b40cf 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
@@ -148,7 +148,7 @@
                     <ToggleSwitch
                         x:Name="togEnableTun"
                         HorizontalAlignment="Left"
-                        Classes="Margin4"
+                        Classes="Margin8"
                         Theme="{StaticResource SimpleToggleSwitch}" />
                 </StackPanel>
 
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index ed33f9fc..af2a979e 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -16,7 +16,7 @@
     <DockPanel Classes="Margin8">
         <StackPanel
             HorizontalAlignment="Center"
-            Classes="Margin4"
+            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -113,7 +113,7 @@
                             <ListBox
                                 x:Name="clbdestOverride"
                                 HorizontalAlignment="Left"
-                                Classes="Margin4"
+                                Classes="Margin8"
                                 SelectionMode="Multiple"
                                 Theme="{DynamicResource PureCardRadioGroupListBox}" />
                         </StackPanel>
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index bd1f91f3..5742dc78 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -243,7 +243,7 @@
                     MinHeight="100"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Center"
-                    Classes="TextArea Margin4"
+                    Classes="TextArea Margin8"
                     MinLines="4"
                     TextWrapping="Wrap"
                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />