From 8e0391195781cb8b78b8fcdfc958eb503d1ad570 Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Tue, 30 Sep 2025 08:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SpineViewer/Views/MainWindow.xaml.cs | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/SpineViewer/Views/MainWindow.xaml.cs b/SpineViewer/Views/MainWindow.xaml.cs
index c034245..0b30d54 100644
--- a/SpineViewer/Views/MainWindow.xaml.cs
+++ b/SpineViewer/Views/MainWindow.xaml.cs
@@ -142,12 +142,13 @@ public partial class MainWindow : Window
 
     private void SaveLastState()
     {
+        var rb = RestoreBounds;
         var m = new LastStateModel()
         {
-            WindowLeft = Left,
-            WindowTop = Top,
-            WindowWidth = Width,
-            WindowHeight = Height,
+            WindowLeft = rb.Left,
+            WindowTop = rb.Top,
+            WindowWidth = rb.Width,
+            WindowHeight = rb.Height,
             WindowState = WindowState,
 
             RootGridCol0Width = _rootGrid.ColumnDefinitions[0].Width.Value,
@@ -226,27 +227,28 @@ public partial class MainWindow : Window
 
     private void MainWindow_Closing(object? sender, CancelEventArgs e)
     {
-        if (_vm.IsShuttingDownFromTray)
-            return;
+        if (!_vm.IsShuttingDownFromTray)
+        {
+            if (_vm.CloseToTray is null)
+            {
+                _vm.PreferenceViewModel.CloseToTray = MessagePopupService.YesNo(AppResource.Str_CloseToTrayQuest);
+                _vm.PreferenceViewModel.SavePreference();
+            }
+            if (_vm.CloseToTray is true)
+            {
+                Hide();
+                e.Cancel = true;
+                return;
+            }
+        }
 
-        if (_vm.CloseToTray is null)
-        {
-            _vm.PreferenceViewModel.CloseToTray = MessagePopupService.YesNo(AppResource.Str_CloseToTrayQuest);
-            _vm.PreferenceViewModel.SavePreference();
-        }
-        if (_vm.CloseToTray is true)
-        {
-            Hide();
-            e.Cancel = true;
-        }
+        SaveLastState();
+        _vm.SFMLRendererViewModel.StopRender();
     }
 
     private void MainWindow_Closed(object? sender, EventArgs e)
     {
-        SaveLastState();
 
-        var vm = _vm.SFMLRendererViewModel;
-        vm.StopRender();
     }
 
     #endregion