From b61b4996f27b39984e469a5e642280ad01d9e23d Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Wed, 13 Mar 2024 18:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=A1=86=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E6=97=B6=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0=E6=9C=80=E5=BA=95=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/MessageBar.xaml    | 4 ++--
 VPet-Simulator.Core/Display/MessageBar.xaml.cs | 5 +++++
 VPet-Simulator.Core/Display/ToolBar.xaml.cs    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml b/VPet-Simulator.Core/Display/MessageBar.xaml
index 660d5df..855c65c 100644
--- a/VPet-Simulator.Core/Display/MessageBar.xaml
+++ b/VPet-Simulator.Core/Display/MessageBar.xaml
@@ -21,10 +21,10 @@
             <Label x:Name="LName" Content="虚拟桌宠名字:" Foreground="{DynamicResource PrimaryText}"
                     HorizontalAlignment="Left" Padding="0" FontWeight="Bold" Margin="0,0,0,6" FontSize="32"
                     Background="{x:Null}" />
-            <ScrollViewer MaxHeight="400">
+            <ScrollViewer x:Name="sv" MaxHeight="400">
                 <TextBox x:Name="TText" Text="我说话长这样,这是我说的话巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉巴拉" IsReadOnly="True"
                         TextWrapping="WrapWithOverflow" FontSize="24" x:FieldModifier="public" Background="{x:Null}"
-                        BorderBrush="{x:Null}" BorderThickness="0" />
+                        BorderBrush="{x:Null}" BorderThickness="0" SizeChanged="TText_SizeChanged" />
             </ScrollViewer>
             <Grid x:Name="MessageBoxContent" x:FieldModifier="public">
 
diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml.cs b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
index f01ead0..a52a02e 100644
--- a/VPet-Simulator.Core/Display/MessageBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
@@ -221,5 +221,10 @@ namespace VPet_Simulator.Core
         private void ContextMenu_Opened(object sender, RoutedEventArgs e) => Border_MouseEnter(null, null);
 
         private void ContextMenu_Closed(object sender, RoutedEventArgs e) => Border_MouseLeave(null, null);
+
+        private void TText_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            sv.ScrollToEnd();
+        }
     }
 }
diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml.cs b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
index 761ecf3..35d231d 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
@@ -249,12 +249,12 @@ namespace VPet_Simulator.Core
         public event Action EventShow;
         public void Show()
         {
+            EventShow?.Invoke();
             if (m.UIGrid.Children.IndexOf(this) != m.UIGrid.Children.Count - 1)
             {
                 Panel.SetZIndex(this, m.UIGrid.Children.Count);
             }
             Visibility = Visibility.Visible;
-            EventShow?.Invoke();
             if (CloseTimer.Enabled)
                 onFocus = true;
             else