fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化资源版本号、UI版本号、Core版本号在外文及其他情况下的显示

Browse Source
This commit is contained in:
status102
2024-09-04 23:51:28 +08:00
parent b31810faaa
commit e3d69ba4e5
1 changed files with 89 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
View File

@@ -90,11 +90,11 @@
<ComboBox
Grid.Row="0"
BorderThickness="0"
Width="130"
Margin="0,10,0,0"
DisplayMemberPath="Display"
HorizontalContentAlignment="Center"
BorderThickness="0"
DisplayMemberPath="Display"
ItemsSource="{Binding ProxyTypeList}"
SelectedValue="{Binding ProxyType}"
SelectedValuePath="Value" />
@@ -107,38 +107,103 @@
Text="{Binding Proxy}" />
<StackPanel Grid.Row="2">
<hc:Shield
Height="NaN"
Margin="0,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding ResourceVersion}"
PreviewMouseDown="ResourceVersionClick"
Status="{Binding ResourceVersion, Mode=OneWay}"
Subject="{DynamicResource ResourceVersion}"
Color="#6969AA" />
<hc:Shield
Margin="0,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding UiVersion}"
PreviewMouseDown="UiVersionClick"
Status="{Binding UiVersion, Mode=OneWay}"
Subject="{DynamicResource UiVersion}"
Color="#6969AA" />
<hc:Shield
Margin="0,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding CoreVersion}"
PreviewMouseDown="CoreVersionClick"
Status="{Binding CoreVersion, Mode=OneWay}"
Subject="{DynamicResource CoreVersion}"
Color="#6969AA" />
Color="#6969AA">
<TextBlock
MaxWidth="150"
Margin="0,3,0,3"
Foreground="White"
Text="{Binding ResourceVersion, Mode=OneWay}"
TextWrapping="Wrap" />
</hc:Shield>
<Grid HorizontalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Border
Grid.Row="0"
Grid.Column="0"
Margin="0,5,0,5"
Background="#555555"
CornerRadius="3,0,0,3">
<TextBlock
Padding="5,3,5,3"
HorizontalAlignment="Center"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding UiVersion}"
Foreground="White"
PreviewMouseDown="UiVersionClick"
Text="{DynamicResource UiVersion}"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="0"
Grid.Column="1"
Margin="0,5,0,5"
Background="#6969AA"
CornerRadius="0,3,3,0">
<TextBlock
MinWidth="50"
Padding="5,3,5,3"
HorizontalAlignment="Left"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding UiVersion}"
Foreground="White"
PreviewMouseDown="UiVersionClick"
Text="{Binding UiVersion, Mode=OneWay}"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="1"
Grid.Column="0"
Margin="0,5,0,5"
Background="#555555"
CornerRadius="3,0,0,3">
<TextBlock
Padding="5,3,5,3"
HorizontalAlignment="Center"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding CoreVersion}"
Foreground="White"
PreviewMouseDown="CoreVersionClick"
Text="{DynamicResource CoreVersion}"
TextWrapping="Wrap" />
</Border>
<Border
Grid.Row="1"
Grid.Column="1"
Margin="0,5,0,5"
Background="#6969AA"
CornerRadius="0,3,3,0">
<TextBlock
MinWidth="50"
Padding="5,3,5,3"
HorizontalAlignment="Left"
VerticalAlignment="Center"
hc:FloatingBlock.Content="{Binding CoreVersion}"
Foreground="White"
PreviewMouseDown="CoreVersionClick"
Text="{Binding CoreVersion, Mode=OneWay}"
TextWrapping="Wrap" />
</Border>
</Grid>
</StackPanel>
<StackPanel
Grid.Row="3"
Margin="5"
Orientation="Horizontal"
HorizontalAlignment="Center">
HorizontalAlignment="Center"
Orientation="Horizontal">
<Button
Margin="5"
Command="{s:Action ManualUpdate}"