From 7dfb9952dd4cc70f4f92e58506e837baff767c19 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Fri, 22 Mar 2024 22:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BC=B9=E7=AA=97=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/Main.xaml      | 14 +++++++++-----
 VPet-Simulator.Core/Display/MainDisplay.cs |  2 +-
 VPet-Simulator.Core/Display/MainLogic.cs   |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/VPet-Simulator.Core/Display/Main.xaml b/VPet-Simulator.Core/Display/Main.xaml
index 2636d2c..b07c23d 100644
--- a/VPet-Simulator.Core/Display/Main.xaml
+++ b/VPet-Simulator.Core/Display/Main.xaml
@@ -9,14 +9,18 @@
                 MouseMove="MainGrid_MouseWave">
             <MediaElement x:Name="VoicePlayer" LoadedBehavior="Manual" UnloadedBehavior="Stop" x:FieldModifier="public" />
             <Grid x:Name="UIGrid_Back" x:FieldModifier="public" VerticalAlignment="Top" Width="500" />
-            <Border x:Name="PetGrid" Height="500" VerticalAlignment="Top" Width="500" x:FieldModifier="public"/>
-            <Border x:Name="PetGrid2" Height="500" VerticalAlignment="Top" Width="500" x:FieldModifier="public" Visibility="Collapsed"/>
+            <Border x:Name="PetGrid" Height="500" VerticalAlignment="Top" Width="500" x:FieldModifier="public" />
+            <Border x:Name="PetGrid2" Height="500" VerticalAlignment="Top" Width="500" x:FieldModifier="public"
+                    Visibility="Collapsed" />
             <Grid x:Name="UIGrid" x:FieldModifier="public" VerticalAlignment="Top" Width="500" />
-            <Label x:Name="LabelDisplay" HorizontalAlignment="Center" VerticalAlignment="Center" Content="内容显示如下"
-                    FontSize="30" Background="{DynamicResource DARKPrimaryTransA}"
+            <Label x:Name="LabelDisplay" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="30"
+                    Background="{DynamicResource DARKPrimaryTransA}" d:Visibility="Visible"
                     Foreground="{DynamicResource DARKPrimaryText}" pu:LabelHelper.CornerRadius="15"
                     pu:LabelHelper.ShadowColor="{DynamicResource ShadowColor}" pu:ShadowHelper.Opacity="0.8"
-                    x:FieldModifier="public" Margin="0,300,0,0" Padding="15,7" Visibility="Collapsed" />
+                    x:FieldModifier="public" Margin="0,300,0,0" Padding="15,7" Visibility="Collapsed">
+                <TextBlock x:Name="LabelDisplayText" Text="Hello World!" x:FieldModifier="public"
+                        TextWrapping="WrapWithOverflow" />
+            </Label>
         </Grid>
     </Viewbox>
 </pu:ContentControlX>
diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs
index 2b3bf91..a39df10 100644
--- a/VPet-Simulator.Core/Display/MainDisplay.cs
+++ b/VPet-Simulator.Core/Display/MainDisplay.cs
@@ -484,7 +484,7 @@ namespace VPet_Simulator.Core
                     {//连Nomal都没有, 证明是未完成的动画, 修改设置+退出游戏
                         Dispatcher.Invoke(() =>
                         {
-                            LabelDisplay.Content = "未找到可播放动画, 已停止运行桌宠模块".Translate();
+                            LabelDisplayText.Text = "未找到可播放动画, 已停止运行桌宠模块".Translate();
                             LabelDisplay.Visibility = Visibility.Visible;
                             IsEnabled = false;
                         });
diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs
index 54dbfb6..5220847 100644
--- a/VPet-Simulator.Core/Display/MainLogic.cs
+++ b/VPet-Simulator.Core/Display/MainLogic.cs
@@ -120,7 +120,7 @@ namespace VPet_Simulator.Core
             labeldisplayhash = text.GetHashCode();
             Dispatcher.Invoke(() =>
             {
-                LabelDisplay.Content = text;
+                LabelDisplayText.Text = text;
                 LabelDisplay.Opacity = 1;
                 LabelDisplay.Visibility = Visibility.Visible;
                 labeldisplaycount = time / 10;
@@ -149,7 +149,7 @@ namespace VPet_Simulator.Core
             }
             Dispatcher.Invoke(() =>
             {
-                LabelDisplay.Content = string.Format(text, labeldisplaychangenum1, labeldisplaychangenum2);
+                LabelDisplayText.Text = string.Format(text, labeldisplaychangenum1, labeldisplaychangenum2);
                 LabelDisplay.Opacity = 1;
                 LabelDisplay.Visibility = Visibility.Visible;
                 labeldisplaycount = time / 10;