Fixed onClose

PixiEditor · Mar 11, 2021 · cd71c96 · cd71c96
1 parent 1df296f
commit cd71c96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/PixiEditor/ViewModels/ViewModelMain.cs b/PixiEditor/ViewModels/ViewModelMain.cs
@@ -176,7 +176,7 @@ private Shortcut CreateToolShortcut<T>(Key key, ModifierKeys modifier = Modifier
             return new Shortcut(key, ToolsSubViewModel.SelectToolCommand, typeof(T), modifier);
         }
 
-        private void CloseWindow(object property)
+        public void CloseWindow(object property)
         {
             if (!(property is CancelEventArgs))
             {

diff --git a/PixiEditor/Views/MainWindow.xaml b/PixiEditor/Views/MainWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:cmd="http://www.galasoft.ch/mvvmlight" 
         xmlns:avalondock="https://github.com/Dirkster99/AvalonDock"
         xmlns:colorpicker="clr-namespace:ColorPicker;assembly=ColorPicker" xmlns:usercontrols="clr-namespace:PixiEditor.Views.UserControls" xmlns:behaviours="clr-namespace:PixiEditor.Helpers.Behaviours" 
-        xmlns:avalonDockTheme="clr-namespace:PixiEditor.Styles.AvalonDock"
+        xmlns:avalonDockTheme="clr-namespace:PixiEditor.Styles.AvalonDock" d:DataContext="{d:DesignInstance Type=vm:ViewModelMain}"
         mc:Ignorable="d" WindowStyle="None" Initialized="MainWindow_Initialized"
         Title="PixiEditor" Name="mainWindow" Height="1000" Width="1600" Background="{StaticResource MainColor}"
         WindowStartupLocation="CenterScreen" WindowState="Maximized">

diff --git a/PixiEditor/Views/MainWindow.xaml.cs b/PixiEditor/Views/MainWindow.xaml.cs
@@ -39,6 +39,7 @@ public MainWindow()
 
         protected override void OnClosing(CancelEventArgs e)
         {
+            ((ViewModelMain)DataContext).CloseWindow(e);
             viewModel.DiscordViewModel.Dispose();
         }