Increase UI grid column widths and font size options

This commit is contained in:
2dust
2025-11-28 20:31:40 +08:00
parent d7f77f220c
commit cc4154bb0d
7 changed files with 39 additions and 38 deletions
@@ -35,7 +35,7 @@
<Grid
Grid.Row="0"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
DockPanel.Dock="Top"
RowDefinitions="Auto,Auto,Auto,Auto">
<TextBlock
@@ -75,7 +75,7 @@
Grid.Row="3"
Grid.Column="0"
Grid.ColumnSpan="3"
ColumnDefinitions="180,Auto,Auto">
ColumnDefinitions="300,Auto,Auto">
<TextBlock
Grid.Column="0"
Margin="{StaticResource Margin4}"
@@ -93,7 +93,7 @@
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.menuServerList}">
<Grid
Margin="{StaticResource Margin8}"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
RowDefinitions="Auto,Auto,Auto">
<TextBlock
@@ -36,7 +36,7 @@
<Grid
Grid.Row="0"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
RowDefinitions="Auto,Auto,Auto,Auto">
<TextBlock
@@ -50,7 +50,7 @@
Orientation="Horizontal">
<ComboBox
x:Name="cmbCoreType"
Width="100"
Width="200"
Margin="{StaticResource Margin4}"
ToolTip.Tip="{x:Static resx:ResUI.TbCoreType}" />
</StackPanel>
@@ -101,7 +101,7 @@
<Grid
x:Name="gridVMess"
Grid.Row="2"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
@@ -167,7 +167,7 @@
<Grid
x:Name="gridSs"
Grid.Row="2"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
@@ -213,7 +213,7 @@
<Grid
x:Name="gridSocks"
Grid.Row="2"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto">
@@ -246,7 +246,7 @@
<Grid
x:Name="gridVLESS"
Grid.Row="2"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
@@ -312,7 +312,7 @@
<Grid
x:Name="gridTrojan"
Grid.Row="2"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
@@ -358,7 +358,7 @@
<Grid
x:Name="gridHysteria2"
Grid.Row="2"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto">
@@ -411,7 +411,7 @@
<Grid
x:Name="gridTuic"
Grid.Row="2"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto">
@@ -457,7 +457,7 @@
<Grid
x:Name="gridWireguard"
Grid.Row="2"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@@ -534,7 +534,7 @@
<Grid
x:Name="gridAnytls"
Grid.Row="2"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto">
@@ -560,7 +560,7 @@
<Grid
x:Name="gridTransport"
Grid.Row="4"
ColumnDefinitions="180,Auto,Auto"
ColumnDefinitions="300,Auto,Auto"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
<TextBlock
@@ -692,7 +692,7 @@
<Grid
x:Name="gridTls"
Grid.Row="6"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
<TextBlock
@@ -711,7 +711,7 @@
<Grid
x:Name="gridTlsMore"
Grid.Row="7"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@@ -831,7 +831,7 @@
<Grid
x:Name="gridRealityMore"
Grid.Row="7"
ColumnDefinitions="180,Auto"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
@@ -13,7 +13,7 @@ public partial class ThemeSettingView : ReactiveUserControl<ThemeSettingViewMode
ViewModel = new ThemeSettingViewModel();
cmbCurrentTheme.ItemsSource = Utils.GetEnumNames<ETheme>();
cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, 11).ToList();
cmbCurrentFontSize.ItemsSource = Enumerable.Range(Global.MinFontSize, Global.MinFontSizeCount).ToList();
cmbCurrentLanguage.ItemsSource = Global.Languages;
this.WhenActivated(disposables =>