Merge pull request 2dust#4255 from crazypeace/master

解决当订阅数量较多时,占用窗口空间太大的问题
qi-o · Sep 22, 2023 · 5284005 · 5284005
2 parents 521ce1a + 34c6c95
commit 5284005
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -386,7 +386,7 @@
                         x:Name="lstGroup"
                         FontSize="{DynamicResource StdFontSize}"
                         ItemContainerStyle="{StaticResource MyChipListBoxItem}"
-                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
+                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}" MaxHeight="120">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding remarks}" />

diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -36,6 +36,8 @@ public MainWindow()
                 this.Height = SystemParameters.WorkArea.Height;
             }
 
+            lstGroup.MaxHeight = Math.Floor(SystemParameters.WorkArea.Height * 0.20 / 40) * 40;
+
             _config = LazyConfig.Instance.GetConfig();
 
             App.Current.SessionEnding += Current_SessionEnding;