From 4d2eb324f1d3c48abd7a20720d175266f0820a19 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:39:08 +0800
Subject: [PATCH] Adjust UI

https://github.com/2dust/v2rayN/issues/6217
---
 .../Views/RoutingRuleSettingWindow.axaml            |  6 +++---
 .../v2rayN.Desktop/Views/RoutingSettingWindow.axaml |  6 +++---
 v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml     |  4 +---
 v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml  |  8 +++-----
 v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml   | 13 +++++++------
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml       |  7 ++++---
 v2rayN/v2rayN/Views/SubEditWindow.xaml              |  8 ++++----
 v2rayN/v2rayN/Views/SubSettingWindow.xaml           |  7 ++++---
 8 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
index 52a2939b..70c3b2c1 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
@@ -7,7 +7,7 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
-    Width="960"
+    Width="1000"
     Height="700"
     x:DataType="vms:RoutingRuleSettingViewModel"
     ShowInTaskbar="False"
@@ -237,11 +237,11 @@
                             Binding="{Binding Network}"
                             Header="network" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Domains}"
                             Header="domain" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Ips}"
                             Header="ip" />
                     </DataGrid.Columns>
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
index 00589a60..53c6f200 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -7,7 +7,7 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingSetting}"
-    Width="990"
+    Width="1000"
     Height="700"
     x:DataType="vms:RoutingSettingViewModel"
     ShowInTaskbar="False"
@@ -109,7 +109,7 @@
                         <DataGrid.Columns>
                             <DataGridCheckBoxColumn Width="40" Binding="{Binding IsActive}" />
                             <DataGridTextColumn
-                                Width="250"
+                                Width="*"
                                 Binding="{Binding Remarks}"
                                 Header="{x:Static resx:ResUI.LvRemarks}" />
                             <DataGridTextColumn
@@ -121,7 +121,7 @@
                                 Binding="{Binding Sort}"
                                 Header="{x:Static resx:ResUI.LvSort}" />
                             <DataGridTextColumn
-                                Width="300"
+                                Width="*"
                                 Binding="{Binding Url}"
                                 Header="{x:Static resx:ResUI.LvUrl}" />
                             <DataGridTextColumn
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index f0b25fe7..556137fd 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -8,9 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
-    Height="600"
-    d:DesignHeight="600"
-    d:DesignWidth="800"
+    Height="650"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
index 6e4ad3a9..fe079f48 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
@@ -8,10 +8,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
-    Width="800"
-    Height="600"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
+    Width="1000"
+    Height="700"
     x:DataType="vms:SubSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
@@ -49,7 +47,7 @@
                 </DataGrid.KeyBindings>
                 <DataGrid.Columns>
                     <DataGridTextColumn
-                        Width="120"
+                        Width="*"
                         Binding="{Binding Remarks}"
                         Header="{x:Static resx:ResUI.LvRemarks}" />
                     <DataGridTextColumn
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 5a4fb1dd..1b6ee984 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -1,17 +1,18 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
-    Width="960"
+    Width="1000"
     Height="700"
     x:TypeArguments="vms:RoutingRuleSettingViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -321,11 +322,11 @@
                             Binding="{Binding Network}"
                             Header="network" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Domains}"
                             Header="domain" />
                         <DataGridTextColumn
-                            Width="200"
+                            Width="*"
                             Binding="{Binding Ips}"
                             Header="ip" />
                     </DataGrid.Columns>
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 0793adee..97eb5754 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -9,9 +9,10 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingSetting}"
-    Width="990"
+    Width="1000"
     Height="700"
     x:TypeArguments="vms:RoutingSettingViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -174,7 +175,7 @@
                         </DataGrid.Resources>
                         <DataGrid.Columns>
                             <DataGridTextColumn
-                                Width="250"
+                                Width="*"
                                 Binding="{Binding Remarks}"
                                 Header="{x:Static resx:ResUI.LvRemarks}" />
                             <DataGridTextColumn
@@ -186,7 +187,7 @@
                                 Binding="{Binding Sort}"
                                 Header="{x:Static resx:ResUI.LvSort}" />
                             <DataGridTextColumn
-                                Width="300"
+                                Width="*"
                                 Binding="{Binding Url}"
                                 Header="{x:Static resx:ResUI.LvUrl}" />
                             <DataGridTextColumn
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index 6882948b..d15a9b36 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -1,16 +1,16 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
-    Height="600"
+    Height="650"
     x:TypeArguments="vms:SubEditViewModel"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
index c34fde49..95738577 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@@ -9,9 +9,10 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
-    Width="800"
-    Height="600"
+    Width="1000"
+    Height="700"
     x:TypeArguments="vms:SubSettingViewModel"
+    ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
     WindowStartupLocation="CenterScreen"
@@ -92,7 +93,7 @@
                 Style="{StaticResource DefDataGrid}">
                 <DataGrid.Columns>
                     <DataGridTextColumn
-                        Width="120"
+                        Width="*"
                         Binding="{Binding Remarks}"
                         Header="{x:Static resx:ResUI.LvRemarks}" />
                     <DataGridTextColumn