Adjust UI

DHR60 2025-07-27 16:44:22 +08:00
parent 72915c15af
commit ee1d0c0e44
1 changed files with 66 additions and 82 deletions

View File

@ -41,46 +41,39 @@
</StackPanel> </StackPanel>
<TabControl HorizontalContentAlignment="Left"> <TabControl HorizontalContentAlignment="Left">
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRayCustomConfig}"> <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRayCustomConfig}">
<Grid Margin="{StaticResource Margin8}"> <DockPanel Margin="{StaticResource Margin8}">
<Grid DockPanel.Dock="Top">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbRayCustomConfigDesc}" /> Text="{x:Static resx:ResUI.TbRayCustomConfigDesc}" />
</StackPanel>
<Grid Grid.Row="1"> <StackPanel Grid.Row="1" Orientation="Horizontal">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbCustomConfigEnable}" /> Text="{x:Static resx:ResUI.TbCustomConfigEnable}" />
<ToggleButton <ToggleButton
x:Name="rayCustomConfigEnable" x:Name="rayCustomConfigEnable"
Grid.Column="1"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
</StackPanel>
</Grid> </Grid>
<TextBox <TextBox
x:Name="rayCustomConfig" x:Name="rayCustomConfig"
Grid.Row="2"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
materialDesign:HintAssist.Hint="xray json config" materialDesign:HintAssist.Hint="xray json config"
AcceptsReturn="True" AcceptsReturn="True"
@ -88,43 +81,39 @@
Style="{StaticResource MaterialDesignOutlinedTextBox}" Style="{StaticResource MaterialDesignOutlinedTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</Grid> </DockPanel>
</TabItem> </TabItem>
<TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbCustomConfigSingbox}"> <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbCustomConfigSingbox}">
<Grid Margin="{StaticResource Margin8}"> <DockPanel Margin="{StaticResource Margin8}">
<Grid DockPanel.Dock="Top">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSBCustomConfigDesc}" /> Text="{x:Static resx:ResUI.TbSBCustomConfigDesc}" />
</StackPanel>
<Grid Grid.Row="1"> <StackPanel Grid.Row="1" Orientation="Horizontal">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbCustomConfigEnable}" /> Text="{x:Static resx:ResUI.TbCustomConfigEnable}" />
<ToggleButton <ToggleButton
x:Name="sbCustomConfigEnable" x:Name="sbCustomConfigEnable"
Grid.Column="1"
Margin="{StaticResource Margin8}" Margin="{StaticResource Margin8}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
</StackPanel>
</Grid> </Grid>
<Grid Grid.Row="2" Margin="{StaticResource Margin8}"> <Grid Margin="{StaticResource Margin8}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" /> <ColumnDefinition Width="1*" />
<ColumnDefinition Width="10" /> <ColumnDefinition Width="10" />
@ -134,8 +123,6 @@
<TextBox <TextBox
x:Name="sbCustomConfig" x:Name="sbCustomConfig"
Grid.Column="0" Grid.Column="0"
Margin="{StaticResource Margin8}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
materialDesign:HintAssist.Hint="sing-box json config" materialDesign:HintAssist.Hint="sing-box json config"
AcceptsReturn="True" AcceptsReturn="True"
@ -149,8 +136,6 @@
<TextBox <TextBox
x:Name="sbCustomTunConfig" x:Name="sbCustomTunConfig"
Grid.Column="2" Grid.Column="2"
Margin="{StaticResource Margin8}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
materialDesign:HintAssist.Hint="sing-box json tun config" materialDesign:HintAssist.Hint="sing-box json tun config"
AcceptsReturn="True" AcceptsReturn="True"
@ -158,9 +143,8 @@
Style="{StaticResource MaterialDesignOutlinedTextBox}" Style="{StaticResource MaterialDesignOutlinedTextBox}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" /> VerticalScrollBarVisibility="Auto" />
</Grid>
</Grid> </Grid>
</DockPanel>
</TabItem> </TabItem>
</TabControl> </TabControl>
</DockPanel> </DockPanel>