From e3d69ba4e5509d91d7c3ff79101d45c8316d588c Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Wed, 4 Sep 2024 23:51:28 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E3=80=81UI=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81Core=E7=89=88=E6=9C=AC=E5=8F=B7=E5=9C=A8?=
 =?UTF-8?q?=E5=A4=96=E6=96=87=E5=8F=8A=E5=85=B6=E4=BB=96=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VersionUpdateSettingsUserControl.xaml     | 113 ++++++++++++++----
 1 file changed, 89 insertions(+), 24 deletions(-)

diff --git a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
index 85cf9e260c..f26680b858 100755
--- a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
@@ -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}"