fix: GUI display issues

fix 4823
This commit is contained in:
枫雨
2023-05-20 14:15:12 +08:00
parent 6e0da992e8
commit 3c58776562
5 changed files with 30 additions and 27 deletions

View File

@@ -91,7 +91,7 @@
<system:String x:Key="StartingCoreCharTip">Only supports the CN name of a single oper, default if not filled.</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">Select &quot;Starting Oper&quot; from support unit list</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">Enable nonfirend support</system:String>
<system:String x:Key="DeploymentWithPause">Deployment with Pause, Works for IS, Copilot and SSS, Beta function, Not recommended yet</system:String>
<system:String x:Key="DeploymentWithPause" xml:space="preserve">Deployment with Pause, Works for IS, Copilot and SSS,&#x0a;Beta function, Not recommended yet</system:String>
<system:String x:Key="AdbLiteEnabled">Use Adb Lite (Experimental)</system:String>
<system:String x:Key="KillAdbOnExit">Kill Adb On Exit</system:String>

View File

@@ -90,7 +90,7 @@
<system:String x:Key="StartingCoreCharTip">단일 오퍼레이터의 중국어 이름만 지원하며, 입력하지 않으면 기본값이 선택됩니다</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">시작 오퍼레이터로 지원 유닛 사용</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">친구가 아니어도 지원 유닛 사용</system:String>
<system:String x:Key="DeploymentWithPause">일시정지 상태로 배치하기 - 통합전략, 자동 작전, 보안 파견에 적용 (베타 기능, 현재 비권장)</system:String>
<system:String x:Key="DeploymentWithPause" xml:space="preserve">일시정지 상태로 배치하기 - 통합전략, 자동 작전, 보안 파견에 적용&#x0a;(베타 기능, 현재 비권장)</system:String>
<system:String x:Key="AdbLiteEnabled">Adb Lite 사용 (실험적)</system:String>
<system:String x:Key="DefaultSquad">기본값</system:String>

View File

@@ -7,7 +7,7 @@
<SolidColorBrush x:Key="MarkdigCodeBrush" Color="LightGray" />
<!-- HandyControl Brush -->
<SolidColorBrush x:Key="SecondaryRegionBrush" Color="#f5f5f5" />
<SolidColorBrush x:Key="SecondaryRegionBrush" Color="#F3F3F3" />
<!-- UiLogColor -->
<SolidColorBrush x:Key="ErrorLogBrush" Color="DarkRed" />

View File

@@ -25,23 +25,25 @@
IsChecked="{Binding AlwaysAutoDetectConnection}"
Visibility="{c:Binding AutoDetectConnection}" />
<hc:SimpleStackPanel
Margin="0,5"
Orientation="Horizontal"
Visibility="{c:Binding !AutoDetectConnection}">
<Grid Margin="0,5" Visibility="{c:Binding !AutoDetectConnection}">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<hc:TextBox
Width="160"
Grid.Column="0"
hc:BorderElement.CornerRadius="4,0,0,4"
hc:InfoElement.Title="{DynamicResource ADBPath}"
Text="{Binding AdbPath}" />
<Button
Grid.Column="1"
Width="60"
VerticalAlignment="Bottom"
hc:BorderElement.CornerRadius="0,4,4,0"
BorderThickness="0,1,1,1"
Command="{s:Action SelectFile}"
Content="{DynamicResource Select}" />
</hc:SimpleStackPanel>
</Grid>
<ComboBox
Margin="0,5"

View File

@@ -140,25 +140,22 @@
ItemsSource="{Binding ConnectConfigList}"
SelectedValue="{Binding ConnectConfig}"
SelectedValuePath="Value" />
<CheckBox
<WrapPanel
Grid.Row="4"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="80,10,10,10"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="{DynamicResource RetryOnDisconnected}"
IsChecked="{Binding RetryOnDisconnected}"
ToolTip="{DynamicResource RetryOnDisconnectedTip}" />
<CheckBox
Grid.Row="4"
Grid.Column="2"
Grid.ColumnSpan="1"
Margin="-80,10,10,10"
Grid.ColumnSpan="3"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{DynamicResource AutoRestartOption}"
IsChecked="{Binding AutoRestartOnDrop}" />
VerticalAlignment="Center">
<CheckBox
Margin="20,10"
Content="{DynamicResource RetryOnDisconnected}"
IsChecked="{Binding RetryOnDisconnected}"
ToolTip="{DynamicResource RetryOnDisconnectedTip}" />
<CheckBox
Margin="20,10"
Content="{DynamicResource AutoRestartOption}"
IsChecked="{Binding AutoRestartOnDrop}" />
</WrapPanel>
<controls:TextBlock
Grid.Row="5"
Grid.Column="0"
@@ -208,8 +205,12 @@
Margin="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{DynamicResource DeploymentWithPause}"
IsChecked="{Binding DeploymentWithPause}" />
IsChecked="{Binding DeploymentWithPause}">
<controls:TextBlock
Block.TextAlignment="Center"
Text="{DynamicResource DeploymentWithPause}"
TextWrapping="Wrap" />
</CheckBox>
<controls:TextBlock
Grid.Row="8"
Grid.Column="0"