From 43685d6e8ea76354683c556f09c654dee845dfff Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Tue, 4 Apr 2023 19:32:53 +1000
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/Main.xaml.cs       | 17 ++++++++++-------
 VPet-Simulator.Core/Display/MainLogic.cs       |  2 +-
 VPet-Simulator.Core/Display/MessageBar.xaml.cs |  4 ++--
 VPet-Simulator.Core/Display/ToolBar.xaml.cs    | 18 +++++++++---------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs
index 72020a0..708168c 100644
--- a/VPet-Simulator.Core/Display/Main.xaml.cs
+++ b/VPet-Simulator.Core/Display/Main.xaml.cs
@@ -64,15 +64,17 @@ namespace VPet_Simulator.Core
             var ig = Core.Graph.FindGraph(GraphCore.GraphType.StartUP, core.Save.Mode);
             //var ig2 = Core.Graph.FindGraph(GraphCore.GraphType.Default, core.Save.Mode);
             PetGrid2.Visibility = Visibility.Collapsed;
-            
-            ig.WaitForReadyRun(PetGrid,()=> {
-                Dispatcher.Invoke(() => {
+
+            ig.WaitForReadyRun(PetGrid, () =>
+            {
+                Dispatcher.Invoke(() =>
+                {
                     PetGrid.Tag = ig;
                     PetGrid2.Tag = ig;
-                });              
+                });
                 DisplayNomal();
             });
-            
+
 
 
             EventTimer.Elapsed += EventTimer_Elapsed;
@@ -96,11 +98,12 @@ namespace VPet_Simulator.Core
         private void MoveTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
             string str = DisplayType.ToString();
-            Core.Controller.MoveWindows(MoveTimerPoint.X, MoveTimerPoint.Y);
-            if (!str.Contains("Left") && !str.Contains("Right"))
+            if (MoveTimer.Enabled == false || (!str.Contains("Left") && !str.Contains("Right")))
             {
                 MoveTimer.Enabled = false;
+                return;
             }
+            Core.Controller.MoveWindows(MoveTimerPoint.X, MoveTimerPoint.Y);
         }
         public Action DefaultClickAction;
         bool isPress = false;
diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs
index 6726657..575bed1 100644
--- a/VPet-Simulator.Core/Display/MainLogic.cs
+++ b/VPet-Simulator.Core/Display/MainLogic.cs
@@ -223,7 +223,7 @@ namespace VPet_Simulator.Core
                 }
                 else
                 {
-                    SmartMoveTimer.Enabled = false; ;
+                    SmartMoveTimer.Enabled = false;
                     SmartMove = false;
                 }
             }
diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml.cs b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
index befbd10..ded6b25 100644
--- a/VPet-Simulator.Core/Display/MessageBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
@@ -104,14 +104,14 @@ namespace VPet_Simulator.Core
             this.sayType = sayType;
         }
 
-        private void Border_MouseEnter(object sender, MouseEventArgs e)
+        public void Border_MouseEnter(object sender, MouseEventArgs e)
         {
             EndTimer.Stop();
             CloseTimer.Stop();
             this.Opacity = .8;
         }
 
-        private void Border_MouseLeave(object sender, MouseEventArgs e)
+        public void Border_MouseLeave(object sender, MouseEventArgs e)
         {
             if (!ShowTimer.Enabled)
                 EndTimer.Start();
diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml.cs b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
index 0134e5b..a86f42c 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
@@ -25,7 +25,7 @@ namespace VPet_Simulator.Core
     public partial class ToolBar : UserControl, IDisposable
     {
         Main m;
-        Timer closetimer;
+       public Timer CloseTimer;
         bool onFocus = false;
         Timer closePanelTimer;
 
@@ -33,13 +33,13 @@ namespace VPet_Simulator.Core
         {
             InitializeComponent();
             this.m = m;
-            closetimer = new Timer()
+            CloseTimer = new Timer()
             {
                 Interval = 4000,
                 AutoReset = false,
                 Enabled = false
             };
-            closetimer.Elapsed += Closetimer_Elapsed;
+            CloseTimer.Elapsed += Closetimer_Elapsed;
             closePanelTimer = new Timer();
             closePanelTimer.Elapsed += ClosePanelTimer_Tick;
             m.TimeUIHandle += M_TimeUIHandle;
@@ -93,7 +93,7 @@ namespace VPet_Simulator.Core
             if (onFocus)
             {
                 onFocus = false;
-                closetimer.Start();
+                CloseTimer.Start();
             }
             else
                 Dispatcher.Invoke(() => this.Visibility = Visibility.Collapsed);
@@ -107,20 +107,20 @@ namespace VPet_Simulator.Core
                 m.UIGrid.Children.Add(this);
             }
             Visibility = Visibility.Visible;
-            if (closetimer.Enabled)
+            if (CloseTimer.Enabled)
                 onFocus = true;
             else
-                closetimer.Start();
+                CloseTimer.Start();
         }
 
         private void UserControl_MouseEnter(object sender, MouseEventArgs e)
         {
-            closetimer.Stop();
+            CloseTimer.Enabled = false;
         }
 
         private void UserControl_MouseLeave(object sender, MouseEventArgs e)
         {
-            closetimer.Start();
+            CloseTimer.Start();
         }
 
         private void MenuPanel_Click(object sender, RoutedEventArgs e)
@@ -255,7 +255,7 @@ namespace VPet_Simulator.Core
         public void Dispose()
         {
             m = null;
-            closetimer.Dispose();
+            CloseTimer.Dispose();
             closePanelTimer.Dispose();
         }