From 3e88e65bbd5951c3869b75efdef4b324c8982688 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Mon, 22 Sep 2025 20:09:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=98=E7=9B=98=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpineViewer/SpineViewer.csproj | 4 ++- .../MainWindow/MainWindowViewModel.cs | 3 ++ SpineViewer/Views/MainWindow.xaml | 17 ++++++++- SpineViewer/Views/MainWindow.xaml.cs | 36 ++++++++++++++----- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/SpineViewer/SpineViewer.csproj b/SpineViewer/SpineViewer.csproj index 6802e32..be27fe0 100644 --- a/SpineViewer/SpineViewer.csproj +++ b/SpineViewer/SpineViewer.csproj @@ -22,7 +22,9 @@ PreserveNewest - + + PreserveNewest + diff --git a/SpineViewer/ViewModels/MainWindow/MainWindowViewModel.cs b/SpineViewer/ViewModels/MainWindow/MainWindowViewModel.cs index 31bc195..e844d31 100644 --- a/SpineViewer/ViewModels/MainWindow/MainWindowViewModel.cs +++ b/SpineViewer/ViewModels/MainWindow/MainWindowViewModel.cs @@ -5,6 +5,7 @@ using SFMLRenderer; using SpineViewer.Models; using SpineViewer.Services; using SpineViewer.Utils; +using System.Windows; using System.Windows.Shell; namespace SpineViewer.ViewModels.MainWindow @@ -72,6 +73,8 @@ namespace SpineViewer.ViewModels.MainWindow public SFMLRendererViewModel SFMLRendererViewModel => _sfmlRendererViewModel; private readonly SFMLRendererViewModel _sfmlRendererViewModel; + public RelayCommand Cmd_Exit => new(App.Current.Shutdown); + /// /// 打开工作区 /// diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml index 0c5d959..1089639 100644 --- a/SpineViewer/Views/MainWindow.xaml +++ b/SpineViewer/Views/MainWindow.xaml @@ -480,7 +480,7 @@ - +