From 1a44fdff45b887d4c1aacbf08e3ee43f9d43aead Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Wed, 11 Oct 2023 22:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=94=AF=E6=8C=81=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E5=AF=BC=E8=88=AA=20(=E6=9C=AA=E5=AE=8C=E6=88=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WinDesign/winGameSetting.xaml                  | 14 +++++++++-----
 .../WinDesign/winGameSetting.xaml.cs               |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
index cd081a8..e26dec8 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
@@ -7,7 +7,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        Width="{ll:Dbe SettingWidth, DefValue=500}" Height="550" Closing="WindowX_Closing" FontSize="16"
+        Width="{ll:Dbe SettingWidth, DefValue=650}" Height="550" Closing="WindowX_Closing" FontSize="16"
         Style="{DynamicResource BaseWindowXStyle}" Topmost="True" WindowStartupLocation="CenterScreen" mc:Ignorable="d">
     <!--<pu:WindowX.Resources>
         <DataTemplate x:Key="DIYDataTemplate">
@@ -15,6 +15,10 @@
         </DataTemplate>
     </pu:WindowX.Resources>-->
     <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="150" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
         <TabControl x:Name="MainTab" Margin="5" pu:TabControlHelper.CanHeaderPanelScroll="True"
                 pu:TabControlHelper.ItemsCornerRadius="4" pu:TabControlHelper.ItemsHeight="NaN"
                 pu:TabControlHelper.ItemsHoverBackground="{DynamicResource PrimaryLight}"
@@ -22,11 +26,11 @@
                 pu:TabControlHelper.ItemsSelectedBackground="{DynamicResource PrimaryDark}"
                 pu:TabControlHelper.ItemsSelectedForeground="{DynamicResource DARKPrimaryText}" Background="Transparent"
                 BorderThickness="0" Foreground="{DynamicResource PrimaryText}"
-                SelectionChanged="MainTab_SelectionChanged">
+                SelectionChanged="MainTab_SelectionChanged" Grid.Column="1">
             <TabControl.ContentTemplate>
                 <DataTemplate>
-                    <Border Margin="5,10,5,20" Background="{DynamicResource DARKPrimaryText}" CornerRadius="15">
-                        <ContentControl Margin="15,10" Content="{Binding}" />
+                    <Border Margin="0,5,0,10" Background="{DynamicResource DARKPrimaryText}" CornerRadius="15">
+                        <ContentControl Margin="10,5" Content="{Binding}" />
                     </Border>
                 </DataTemplate>
             </TabControl.ContentTemplate>
@@ -957,6 +961,6 @@
             </TabItem>
         </TabControl>
         <Label x:Name="GameVerison" HorizontalAlignment="Left" VerticalAlignment="Bottom" Background="{x:Null}"
-                Content="版本v1.0 (655366666)" FontSize="10" Foreground="Green" />
+                Content="版本v1.0 (655366666)" FontSize="10" Foreground="Green" Grid.ColumnSpan="2" />
     </Grid>
 </pu:WindowX>
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
index f5bf6c8..73fa4eb 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
@@ -1327,5 +1327,7 @@ namespace VPet_Simulator.Windows
             mw.Set.HideFromTaskControl = SwitchHideFromTaskControl.IsChecked == true;
             ButtonRestartGraph.Visibility = Visibility.Visible;
         }
+
+
     }
 }