Fixed window closing process.

t-miyake · Oct 1, 2017 · c30d6bc · c30d6bc
1 parent bcc8252
commit c30d6bc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/PocketFanController/ConfigWindow.xaml.cs b/PocketFanController/ConfigWindow.xaml.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace PocketFanController
 {
@@ -22,6 +10,10 @@ public partial class ConfigWindow : Window
         public ConfigWindow()
         {
             InitializeComponent();
+            var vm = new ConfigWindowViewModel();
+            DataContext = vm;
+            if (vm.CloseAction == null)
+                vm.CloseAction = Close;
         }
     }
 }
diff --git a/PocketFanController/ConfigWindowViewModel.cs b/PocketFanController/ConfigWindowViewModel.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Input;
 
 namespace PocketFanController
@@ -12,6 +13,8 @@ public class ConfigWindowViewModel : ViewModelBase
         public ICommand CancelButton { get; }
         public ICommand ApplyButton { get; }
 
+        public Action CloseAction { get; set; }
+
         public int Margin
         {
             get => Model.ManualMargin;
@@ -64,7 +67,7 @@ public ConfigWindowViewModel()
             {
                 Model.SaveManualConfig(Margin, BorderOfSlow, BorderOfFast, BorderOfFastest);
                 SetManual();
-                Application.Current.MainWindow.Close();
+                CloseAction();
             });
 
             ApplyButton = new RelayCommand(() =>
@@ -76,7 +79,7 @@ public ConfigWindowViewModel()
 
             CancelButton = new RelayCommand(() =>
             {
-                Application.Current.MainWindow.Close();
+                CloseAction();
             });
 
             Model.GetManualConfigs();

diff --git a/PocketFanController/Properties/AssemblyInfo.cs b/PocketFanController/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.1.0")]
-[assembly: AssemblyFileVersion("0.5.1.0")]
+[assembly: AssemblyVersion("0.5.2.0")]
+[assembly: AssemblyFileVersion("0.5.2.0")]
 [assembly: NeutralResourcesLanguage("en")]