diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs index 492aa124..c96578d4 100644 --- a/v2rayN/ServiceLib/Global.cs +++ b/v2rayN/ServiceLib/Global.cs @@ -73,6 +73,7 @@ public class Global public const string GrpcMultiMode = "multi"; public const int MaxPort = 65536; public const int MinFontSize = 8; + public const int MinFontSizeCount = 13; public const string RebootAs = "rebootas"; public const string AvaAssets = "avares://v2rayN/Assets/"; public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA_V2"; diff --git a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml index 7507ce89..82fc7970 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml @@ -35,7 +35,7 @@ + ColumnDefinitions="300,Auto,Auto"> @@ -101,7 +101,7 @@ @@ -167,7 +167,7 @@ @@ -213,7 +213,7 @@ @@ -246,7 +246,7 @@ @@ -312,7 +312,7 @@ @@ -358,7 +358,7 @@ @@ -411,7 +411,7 @@ @@ -457,7 +457,7 @@ @@ -534,7 +534,7 @@ @@ -560,7 +560,7 @@ @@ -831,7 +831,7 @@ diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs index 68bde409..d3103b11 100644 --- a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs @@ -13,7 +13,7 @@ public partial class ThemeSettingView : ReactiveUserControl(); - cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList(); + cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList(); cmbCurrentLanguage.ItemsSource = Global.Languages; this.WhenActivated(disposables => diff --git a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml index bfc9b2f2..97f54407 100644 --- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml @@ -62,7 +62,7 @@ - + @@ -111,7 +111,7 @@ Grid.Column="0" Grid.ColumnSpan="3"> - + @@ -143,7 +143,7 @@ - + diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index 9b1e7857..99778dd2 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml @@ -70,7 +70,7 @@ - + @@ -87,7 +87,7 @@ Orientation="Horizontal"> @@ -157,7 +157,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -489,7 +489,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -753,7 +753,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -931,7 +931,7 @@ - + @@ -1067,7 +1067,7 @@ - + diff --git a/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs b/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs index 0aacbdbb..000d3fa4 100644 --- a/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs +++ b/v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs @@ -13,7 +13,7 @@ public partial class ThemeSettingView ViewModel = new ThemeSettingViewModel(); cmbCurrentTheme.ItemsSource = Utils.GetEnumNames().Take(3).ToList(); - cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList(); + cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList(); cmbCurrentLanguage.ItemsSource = Global.Languages; this.WhenActivated(disposables =>