From ea35d430b15163b7d6bd265a14a13c7d3c253b5c Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Sun, 10 Sep 2023 23:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E5=92=8CUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WinDesign/winGameSetting.xaml             | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
index 3a96902..3deb97b 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
@@ -377,8 +377,7 @@
                                 <RowDefinition Height="35" />
                                 <RowDefinition Height="35" />
                                 <RowDefinition Height="35" />
-                                <RowDefinition Height="35" />
-                                <RowDefinition Height="35" />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <pu:Switch x:Name="CalFunctionBox" Grid.Column="2" Background="Transparent"
                                     BorderBrush="{DynamicResource PrimaryDark}" BoxHeight="18" BoxWidth="35"
@@ -493,36 +492,35 @@
                                     </ComboBoxItem>
                                 </ComboBox>
                             </Grid>
-                            <Grid Grid.Row="7" Grid.RowSpan="2" Grid.Column="3">
+                            <Grid Grid.Row="7" Grid.Column="3">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="35" />
-                                    <RowDefinition Height="35" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
-                                <TextBlock Grid.Row="0" Text="{ll:Str '当前移动区域：'}"/>
-                                <TextBlock x:Name="textMoveArea" Grid.Column="1" Grid.ColumnSpan="2" Text="{ll:Str '主屏幕'}"/>
-                                <Button x:Name="BtnSetMoveArea_Default" Grid.Row="1" Grid.Column="0" Margin="5,5,5,5" Padding="1"
-                                    pu:ButtonHelper.CornerRadius="4" Background="{DynamicResource SecondaryLight}"
-                                    Click="BtnSetMoveArea_Default_Click" Content="{ll:Str 重置为主屏}"/>
-                                <Button x:Name="BtnSetMoveArea_DetectScreen" Grid.Row="1" Grid.Column="1" Margin="5,5,5,5" Padding="1"
-                                    pu:ButtonHelper.CornerRadius="4" Background="{DynamicResource SecondaryLight}"
-                                    Click="BtnSetMoveArea_DetectScreen_Click" Content="{ll:Str 设为桌宠屏幕}"
-                                    ToolTip="{ll:Str 当屏幕分辨率不为100%时可能识别有误}"/>
-                                <Button x:Name="BtnSetMoveArea_Window" Grid.Row="1" Grid.Column="2" Margin="5,5,5,5" Padding="1"
-                                    pu:ButtonHelper.CornerRadius="4" Background="{DynamicResource SecondaryLight}"
-                                    Click="BtnSetMoveArea_Window_Click" Content="{ll:Str 设为窗口范围}">
-                                    <Button.ToolTip>
-                                        <TextBlock>
-                                            <TextBlock Text="{ll:Str 使用设置窗口框选范围后点击}"/>
-                                            <LineBreak /> 
-                                            <TextBlock Text="{ll:Str 注：双击顶端可最大化设置页}"/>
-                                        </TextBlock>
-                                    </Button.ToolTip>
-                                </Button>
+                                <TextBlock Grid.Row="0" Text="{ll:Str '当前移动区域：'}" />
+                                <TextBlock x:Name="textMoveArea" Grid.Column="1" Grid.ColumnSpan="2"
+                                        Text="{ll:Str '主屏幕'}" />
+                                <Button x:Name="BtnSetMoveArea_Default" Grid.Row="1" Grid.Column="0" Margin="5,5,5,5"
+                                        Padding="1" pu:ButtonHelper.CornerRadius="4"
+                                        Background="{DynamicResource SecondaryLight}"
+                                        Click="BtnSetMoveArea_Default_Click" Content="{ll:Str 重置为主屏}"
+                                        ToolTip="{ll:Str `设置桌宠只在主屏幕进行移动`}" />
+                                <Button x:Name="BtnSetMoveArea_DetectScreen" Grid.Row="1" Grid.Column="1"
+                                        Margin="5,5,5,5" Padding="1" pu:ButtonHelper.CornerRadius="4"
+                                        Background="{DynamicResource SecondaryLight}"
+                                        Click="BtnSetMoveArea_DetectScreen_Click" Content="{ll:Str 设为当前屏幕}"
+                                        ToolTip="{ll:Str '设置桌宠只在当前桌宠所在的屏幕范围进行移动'}" />
+                                <Button x:Name="BtnSetMoveArea_Window" Grid.Row="1" Grid.Column="2" Margin="5,5,5,5"
+                                        Padding="1" pu:ButtonHelper.CornerRadius="4"
+                                        Background="{DynamicResource SecondaryLight}"
+                                        Click="BtnSetMoveArea_Window_Click" Content="{ll:Str 自定移动范围}"
+                                        ToolTip="{ll:Str '手动设置桌宠可移动范围'}"
+                                        />
                             </Grid>
                             <TextBlock Grid.Row="0" VerticalAlignment="Center" Text="{ll:Str 数据计算}" />
                             <TextBlock Grid.Row="1" VerticalAlignment="Center" Text="{ll:Str 显示状态}" />