Skip to content

Commit cc4154b

Browse files
2dust2dust
committed
Increase UI grid column widths and font size options
1 parent d7f77f2 commit cc4154b

7 files changed

Lines changed: 39 additions & 38 deletions

File tree

‎v2rayN/ServiceLib/Global.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public class Global
7373
public const string GrpcMultiMode = "multi";
7474
public const int MaxPort = 65536;
7575
public const int MinFontSize = 8;
76+
public const int MinFontSizeCount = 13;
7677
public const string RebootAs = "rebootas";
7778
public const string AvaAssets = "avares://v2rayN/Assets/";
7879
public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA_V2";

‎v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<Grid
3737
Grid.Row="0"
38-
ColumnDefinitions="180,Auto,Auto"
38+
ColumnDefinitions="300,Auto,Auto"
3939
DockPanel.Dock="Top"
4040
RowDefinitions="Auto,Auto,Auto,Auto">
4141
<TextBlock
@@ -75,7 +75,7 @@
7575
Grid.Row="3"
7676
Grid.Column="0"
7777
Grid.ColumnSpan="3"
78-
ColumnDefinitions="180,Auto,Auto">
78+
ColumnDefinitions="300,Auto,Auto">
7979
<TextBlock
8080
Grid.Column="0"
8181
Margin="{StaticResource Margin4}"
@@ -93,7 +93,7 @@
9393
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
9494
<Grid
9595
Margin="{StaticResource Margin8}"
96-
ColumnDefinitions="180,Auto,Auto"
96+
ColumnDefinitions="300,Auto,Auto"
9797
RowDefinitions="Auto,Auto,Auto">
9898

9999
<TextBlock

‎v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<Grid
3838
Grid.Row="0"
39-
ColumnDefinitions="180,Auto,Auto"
39+
ColumnDefinitions="300,Auto,Auto"
4040
RowDefinitions="Auto,Auto,Auto,Auto">
4141

4242
<TextBlock
@@ -50,7 +50,7 @@
5050
Orientation="Horizontal">
5151
<ComboBox
5252
x:Name="cmbCoreType"
53-
Width="100"
53+
Width="200"
5454
Margin="{StaticResource Margin4}"
5555
ToolTip.Tip="{x:Static resx:ResUI.TbCoreType}" />
5656
</StackPanel>
@@ -101,7 +101,7 @@
101101
<Grid
102102
x:Name="gridVMess"
103103
Grid.Row="2"
104-
ColumnDefinitions="180,Auto,Auto"
104+
ColumnDefinitions="300,Auto,Auto"
105105
IsVisible="False"
106106
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
107107

@@ -167,7 +167,7 @@
167167
<Grid
168168
x:Name="gridSs"
169169
Grid.Row="2"
170-
ColumnDefinitions="180,Auto"
170+
ColumnDefinitions="300,Auto"
171171
IsVisible="False"
172172
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
173173

@@ -213,7 +213,7 @@
213213
<Grid
214214
x:Name="gridSocks"
215215
Grid.Row="2"
216-
ColumnDefinitions="180,Auto"
216+
ColumnDefinitions="300,Auto"
217217
IsVisible="False"
218218
RowDefinitions="Auto,Auto,Auto,Auto">
219219

@@ -246,7 +246,7 @@
246246
<Grid
247247
x:Name="gridVLESS"
248248
Grid.Row="2"
249-
ColumnDefinitions="180,Auto,Auto"
249+
ColumnDefinitions="300,Auto,Auto"
250250
IsVisible="False"
251251
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
252252

@@ -312,7 +312,7 @@
312312
<Grid
313313
x:Name="gridTrojan"
314314
Grid.Row="2"
315-
ColumnDefinitions="180,Auto"
315+
ColumnDefinitions="300,Auto"
316316
IsVisible="False"
317317
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
318318

@@ -358,7 +358,7 @@
358358
<Grid
359359
x:Name="gridHysteria2"
360360
Grid.Row="2"
361-
ColumnDefinitions="180,Auto,Auto"
361+
ColumnDefinitions="300,Auto,Auto"
362362
IsVisible="False"
363363
RowDefinitions="Auto,Auto,Auto,Auto">
364364

@@ -411,7 +411,7 @@
411411
<Grid
412412
x:Name="gridTuic"
413413
Grid.Row="2"
414-
ColumnDefinitions="180,Auto"
414+
ColumnDefinitions="300,Auto"
415415
IsVisible="False"
416416
RowDefinitions="Auto,Auto,Auto,Auto">
417417

@@ -457,7 +457,7 @@
457457
<Grid
458458
x:Name="gridWireguard"
459459
Grid.Row="2"
460-
ColumnDefinitions="180,Auto"
460+
ColumnDefinitions="300,Auto"
461461
IsVisible="False"
462462
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
463463

@@ -534,7 +534,7 @@
534534
<Grid
535535
x:Name="gridAnytls"
536536
Grid.Row="2"
537-
ColumnDefinitions="180,Auto"
537+
ColumnDefinitions="300,Auto"
538538
IsVisible="False"
539539
RowDefinitions="Auto,Auto,Auto">
540540

@@ -560,7 +560,7 @@
560560
<Grid
561561
x:Name="gridTransport"
562562
Grid.Row="4"
563-
ColumnDefinitions="180,Auto,Auto"
563+
ColumnDefinitions="300,Auto,Auto"
564564
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
565565

566566
<TextBlock
@@ -692,7 +692,7 @@
692692
<Grid
693693
x:Name="gridTls"
694694
Grid.Row="6"
695-
ColumnDefinitions="180,Auto"
695+
ColumnDefinitions="300,Auto"
696696
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
697697

698698
<TextBlock
@@ -711,7 +711,7 @@
711711
<Grid
712712
x:Name="gridTlsMore"
713713
Grid.Row="7"
714-
ColumnDefinitions="180,Auto"
714+
ColumnDefinitions="300,Auto"
715715
IsVisible="False"
716716
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
717717

@@ -831,7 +831,7 @@
831831
<Grid
832832
x:Name="gridRealityMore"
833833
Grid.Row="7"
834-
ColumnDefinitions="180,Auto"
834+
ColumnDefinitions="300,Auto"
835835
IsVisible="False"
836836
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
837837

‎v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public ThemeSettingView()
1313
ViewModel = new ThemeSettingViewModel();
1414

1515
cmbCurrentTheme.ItemsSource = Utils.GetEnumNames<ETheme>();
16-
cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList();
16+
cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList();
1717
cmbCurrentLanguage.ItemsSource = Global.Languages;
1818

1919
this.WhenActivated(disposables =>

‎v2rayN/v2rayN/Views/AddGroupServerWindow.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<RowDefinition Height="Auto" />
6363
</Grid.RowDefinitions>
6464
<Grid.ColumnDefinitions>
65-
<ColumnDefinition Width="180" />
65+
<ColumnDefinition Width="300" />
6666
<ColumnDefinition Width="Auto" />
6767
<ColumnDefinition Width="Auto" />
6868
</Grid.ColumnDefinitions>
@@ -111,7 +111,7 @@
111111
Grid.Column="0"
112112
Grid.ColumnSpan="3">
113113
<Grid.ColumnDefinitions>
114-
<ColumnDefinition Width="180" />
114+
<ColumnDefinition Width="300" />
115115
<ColumnDefinition Width="Auto" />
116116
<ColumnDefinition Width="Auto" />
117117
</Grid.ColumnDefinitions>
@@ -143,7 +143,7 @@
143143
<RowDefinition Height="Auto" />
144144
</Grid.RowDefinitions>
145145
<Grid.ColumnDefinitions>
146-
<ColumnDefinition Width="180" />
146+
<ColumnDefinition Width="300" />
147147
<ColumnDefinition Width="Auto" />
148148
<ColumnDefinition Width="Auto" />
149149
</Grid.ColumnDefinitions>

‎v2rayN/v2rayN/Views/AddServerWindow.xaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<RowDefinition Height="Auto" />
7171
</Grid.RowDefinitions>
7272
<Grid.ColumnDefinitions>
73-
<ColumnDefinition Width="180" />
73+
<ColumnDefinition Width="300" />
7474
<ColumnDefinition Width="Auto" />
7575
<ColumnDefinition Width="Auto" />
7676
</Grid.ColumnDefinitions>
@@ -87,7 +87,7 @@
8787
Orientation="Horizontal">
8888
<ComboBox
8989
x:Name="cmbCoreType"
90-
Width="100"
90+
Width="200"
9191
Margin="{StaticResource Margin4}"
9292
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbCoreType}"
9393
Style="{StaticResource DefComboBox}" />
@@ -157,7 +157,7 @@
157157
<RowDefinition Height="Auto" />
158158
</Grid.RowDefinitions>
159159
<Grid.ColumnDefinitions>
160-
<ColumnDefinition Width="180" />
160+
<ColumnDefinition Width="300" />
161161
<ColumnDefinition Width="Auto" />
162162
<ColumnDefinition Width="Auto" />
163163
</Grid.ColumnDefinitions>
@@ -241,7 +241,7 @@
241241
<RowDefinition Height="Auto" />
242242
</Grid.RowDefinitions>
243243
<Grid.ColumnDefinitions>
244-
<ColumnDefinition Width="180" />
244+
<ColumnDefinition Width="300" />
245245
<ColumnDefinition Width="Auto" />
246246
</Grid.ColumnDefinitions>
247247

@@ -300,7 +300,7 @@
300300
<RowDefinition Height="Auto" />
301301
</Grid.RowDefinitions>
302302
<Grid.ColumnDefinitions>
303-
<ColumnDefinition Width="180" />
303+
<ColumnDefinition Width="300" />
304304
<ColumnDefinition Width="Auto" />
305305
</Grid.ColumnDefinitions>
306306

@@ -346,7 +346,7 @@
346346
<RowDefinition Height="Auto" />
347347
</Grid.RowDefinitions>
348348
<Grid.ColumnDefinitions>
349-
<ColumnDefinition Width="180" />
349+
<ColumnDefinition Width="300" />
350350
<ColumnDefinition Width="Auto" />
351351
<ColumnDefinition Width="Auto" />
352352
</Grid.ColumnDefinitions>
@@ -430,7 +430,7 @@
430430
<RowDefinition Height="Auto" />
431431
</Grid.RowDefinitions>
432432
<Grid.ColumnDefinitions>
433-
<ColumnDefinition Width="180" />
433+
<ColumnDefinition Width="300" />
434434
<ColumnDefinition Width="Auto" />
435435
</Grid.ColumnDefinitions>
436436

@@ -489,7 +489,7 @@
489489
<RowDefinition Height="Auto" />
490490
</Grid.RowDefinitions>
491491
<Grid.ColumnDefinitions>
492-
<ColumnDefinition Width="180" />
492+
<ColumnDefinition Width="300" />
493493
<ColumnDefinition Width="Auto" />
494494
<ColumnDefinition Width="Auto" />
495495
</Grid.ColumnDefinitions>
@@ -559,7 +559,7 @@
559559
<RowDefinition Height="Auto" />
560560
</Grid.RowDefinitions>
561561
<Grid.ColumnDefinitions>
562-
<ColumnDefinition Width="180" />
562+
<ColumnDefinition Width="300" />
563563
<ColumnDefinition Width="Auto" />
564564
</Grid.ColumnDefinitions>
565565

@@ -621,7 +621,7 @@
621621
<RowDefinition Height="Auto" />
622622
</Grid.RowDefinitions>
623623
<Grid.ColumnDefinitions>
624-
<ColumnDefinition Width="180" />
624+
<ColumnDefinition Width="300" />
625625
<ColumnDefinition Width="Auto" />
626626
</Grid.ColumnDefinitions>
627627

@@ -715,7 +715,7 @@
715715
<RowDefinition Height="Auto" />
716716
</Grid.RowDefinitions>
717717
<Grid.ColumnDefinitions>
718-
<ColumnDefinition Width="180" />
718+
<ColumnDefinition Width="300" />
719719
<ColumnDefinition Width="Auto" />
720720
</Grid.ColumnDefinitions>
721721

@@ -753,7 +753,7 @@
753753
<RowDefinition Height="Auto" />
754754
</Grid.RowDefinitions>
755755
<Grid.ColumnDefinitions>
756-
<ColumnDefinition Width="180" />
756+
<ColumnDefinition Width="300" />
757757
<ColumnDefinition Width="Auto" />
758758
<ColumnDefinition Width="Auto" />
759759
</Grid.ColumnDefinitions>
@@ -899,7 +899,7 @@
899899
<RowDefinition Height="Auto" />
900900
</Grid.RowDefinitions>
901901
<Grid.ColumnDefinitions>
902-
<ColumnDefinition Width="180" />
902+
<ColumnDefinition Width="300" />
903903
<ColumnDefinition Width="Auto" />
904904
</Grid.ColumnDefinitions>
905905

@@ -931,7 +931,7 @@
931931
<RowDefinition Height="Auto" />
932932
</Grid.RowDefinitions>
933933
<Grid.ColumnDefinitions>
934-
<ColumnDefinition Width="180" />
934+
<ColumnDefinition Width="300" />
935935
<ColumnDefinition Width="Auto" />
936936
</Grid.ColumnDefinitions>
937937

@@ -1067,7 +1067,7 @@
10671067
<RowDefinition Height="Auto" />
10681068
</Grid.RowDefinitions>
10691069
<Grid.ColumnDefinitions>
1070-
<ColumnDefinition Width="180" />
1070+
<ColumnDefinition Width="300" />
10711071
<ColumnDefinition Width="Auto" />
10721072
</Grid.ColumnDefinitions>
10731073

‎v2rayN/v2rayN/Views/ThemeSettingView.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public ThemeSettingView()
1313
ViewModel = new ThemeSettingViewModel();
1414

1515
cmbCurrentTheme.ItemsSource = Utils.GetEnumNames<ETheme>().Take(3).ToList();
16-
cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList();
16+
cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList();
1717
cmbCurrentLanguage.ItemsSource = Global.Languages;
1818

1919
this.WhenActivated(disposables =>

0 commit comments

Comments
 (0)