chizui/SpineViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复可能的窗口大小不正确问题

Browse Source
This commit is contained in:
ww-rm
2025-09-30 08:55:00 +08:00
parent 0b3db0fd0d
commit 8e03911957
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SpineViewer/Views/MainWindow.xaml.cs
View File

@@ -142,12 +142,13 @@ public partial class MainWindow : Window
private void SaveLastState() private void SaveLastState()
{ {
var rb = RestoreBounds;
var m = new LastStateModel() var m = new LastStateModel()
{ {
WindowLeft = Left, WindowLeft = rb.Left,
WindowTop = Top, WindowTop = rb.Top,
WindowWidth = Width, WindowWidth = rb.Width,
WindowHeight = Height, WindowHeight = rb.Height,
WindowState = WindowState, WindowState = WindowState,
RootGridCol0Width = _rootGrid.ColumnDefinitions[0].Width.Value, RootGridCol0Width = _rootGrid.ColumnDefinitions[0].Width.Value,
@@ -226,9 +227,8 @@ public partial class MainWindow : Window
private void MainWindow_Closing(object? sender, CancelEventArgs e) private void MainWindow_Closing(object? sender, CancelEventArgs e)
{ {
if (_vm.IsShuttingDownFromTray) if (!_vm.IsShuttingDownFromTray)
return; {
if (_vm.CloseToTray is null) if (_vm.CloseToTray is null)
{ {
_vm.PreferenceViewModel.CloseToTray = MessagePopupService.YesNo(AppResource.Str_CloseToTrayQuest); _vm.PreferenceViewModel.CloseToTray = MessagePopupService.YesNo(AppResource.Str_CloseToTrayQuest);
@@ -238,15 +238,17 @@ public partial class MainWindow : Window
{ {
Hide(); Hide();
e.Cancel = true; e.Cancel = true;
return;
} }
} }
SaveLastState();
_vm.SFMLRendererViewModel.StopRender();
}
private void MainWindow_Closed(object? sender, EventArgs e) private void MainWindow_Closed(object? sender, EventArgs e)
{ {
SaveLastState();
var vm = _vm.SFMLRendererViewModel;
vm.StopRender();
} }
#endregion #endregion