From 52e9d30b46c9ad94b8c8c866a922568a46a5c2e9 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 4 Feb 2024 10:02:02 +0800
Subject: [PATCH] Improve

---
 v2rayN/v2rayN/Views/SubEditWindow.xaml | 93 +++++++++++++-------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index ef22c501..37a6bc59 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -72,7 +72,7 @@
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="400" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
@@ -95,7 +95,6 @@
                     x:Name="txtRemarks"
                     Grid.Row="1"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
@@ -113,7 +112,6 @@
                     x:Name="txtUrl"
                     Grid.Row="2"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
@@ -153,48 +151,51 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.LvEnabled}" />
-                <ToggleButton
-                    x:Name="togEnable"
+
+                <DockPanel
                     Grid.Row="3"
                     Grid.Column="1"
-                    Margin="4"
-                    HorizontalAlignment="Left" />
+                    Margin="4">
+                    <ToggleButton
+                        x:Name="togEnable"
+                        Margin="4"
+                        HorizontalAlignment="Left"
+                        DockPanel.Dock="Left" />
 
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
-                <TextBox
-                    x:Name="txtAutoUpdateInterval"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
+                    <TextBox
+                        x:Name="txtAutoUpdateInterval"
+                        Width="200"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
+                        AcceptsReturn="True"
+                        DockPanel.Dock="Right"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+
+                    <TextBlock
+                        Margin="4"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.LvAutoUpdateInterval}" />
+                </DockPanel>
 
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
-                    Text="{x:Static resx:ResUI.LvUserAgent}" />
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.LvFilter}" />
                 <TextBox
-                    x:Name="txtUserAgent"
+                    x:Name="txtFilter"
                     Grid.Row="5"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
                     AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}"
-                    TextWrapping="Wrap" />
+                    Style="{StaticResource MyOutlinedTextBox}" />
 
                 <TextBlock
                     Grid.Row="6"
@@ -202,33 +203,32 @@
                     Margin="4"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.LvFilter}" />
-                <TextBox
-                    x:Name="txtFilter"
+                    Text="{x:Static resx:ResUI.LvConvertTarget}" />
+                <ComboBox
+                    x:Name="cmbConvertTarget"
                     Grid.Row="6"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
-                    VerticalAlignment="Top"
-                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
+                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
+                    MaxDropDownHeight="1000"
+                    Style="{StaticResource MyOutlinedTextComboBox}" />
 
                 <TextBlock
                     Grid.Row="7"
                     Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.LvConvertTarget}" />
-                <ComboBox
-                    x:Name="cmbConvertTarget"
+                    Text="{x:Static resx:ResUI.LvUserAgent}" />
+                <TextBox
+                    x:Name="txtUserAgent"
                     Grid.Row="7"
                     Grid.Column="1"
                     Margin="4"
-                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvConvertTargetTip}"
-                    MaxDropDownHeight="1000"
-                    Style="{StaticResource MyOutlinedTextComboBox}" />
+                    VerticalAlignment="Top"
+                    materialDesign:HintAssist.Hint="{x:Static resx:ResUI.SubUrlTips}"
+                    AcceptsReturn="True"
+                    Style="{StaticResource MyOutlinedTextBox}"
+                    TextWrapping="Wrap" />
 
                 <TextBlock
                     Grid.Row="8"
@@ -241,8 +241,9 @@
                     x:Name="txtSort"
                     Grid.Row="8"
                     Grid.Column="1"
-                    Width="400"
+                    Width="100"
                     Margin="4"
+                    HorizontalAlignment="Left"
                     VerticalAlignment="Top"
                     AcceptsReturn="True"
                     Style="{StaticResource MyOutlinedTextBox}" />
@@ -258,7 +259,6 @@
                     x:Name="txtPrevProfile"
                     Grid.Row="9"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"
@@ -276,7 +276,6 @@
                     x:Name="txtNextProfile"
                     Grid.Row="10"
                     Grid.Column="1"
-                    Width="400"
                     Margin="4"
                     VerticalAlignment="Top"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.LvPrevProfileTip}"