From 22009d1b71315b9c3f2f28ffb17283d7613cf381 Mon Sep 17 00:00:00 2001
From: Space Time <Zeus6_6@163.com>
Date: Sat, 23 Nov 2024 10:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E9=98=85=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3=E7=9A=84=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=20(#6132)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 调整订阅分组设置窗口的布局

* 避免添加配置后出现滚动条
---
 v2rayN/ServiceLib/Handler/ConfigHandler.cs         | 2 +-
 v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml | 2 +-
 v2rayN/v2rayN/Views/SubSettingWindow.xaml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
index 5920a1f88f..745bf959e3 100644
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -383,7 +383,7 @@ public static async Task<int> SetDefaultServer(Config config, List<ProfileItemMo
             }
 
             var item = await SQLiteHelper.Instance.TableAsync<ProfileItem>().FirstOrDefaultAsync(t => t.Port > 0);
-            return await SetDefaultServerIndex(config, item.IndexId);
+            return await SetDefaultServerIndex(config, item?.IndexId);
         }
 
         public static async Task<ProfileItem?> GetDefaultServer(Config config)
diff --git a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
index 7d43eb37db..6e4ad3a90c 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml
@@ -53,7 +53,7 @@
                         Binding="{Binding Remarks}"
                         Header="{x:Static resx:ResUI.LvRemarks}" />
                     <DataGridTextColumn
-                        Width="150"
+                        Width="*"
                         Binding="{Binding Url}"
                         Header="{x:Static resx:ResUI.LvUrl}" />
                     <DataGridCheckBoxColumn
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
index 0d73e52cf0..c34fde4990 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@@ -96,7 +96,7 @@
                         Binding="{Binding Remarks}"
                         Header="{x:Static resx:ResUI.LvRemarks}" />
                     <DataGridTextColumn
-                        Width="150"
+                        Width="*"
                         Binding="{Binding Url}"
                         Header="{x:Static resx:ResUI.LvUrl}" />
                     <DataGridCheckBoxColumn