From c7fdb871c7110df02a5452a62b0d8edc735efbb3 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 2 Sep 2021 11:57:11 +0200
Subject: [PATCH] Disabled confirmation to close after closing settings window
---
.../ViewModel/Implementation/SettingsViewModel.cs | 11 +----------
VECTO3GUI2020/Views/SettingsView.xaml | 4 +---
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/VECTO3GUI2020/ViewModel/Implementation/SettingsViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/SettingsViewModel.cs
index 76246e6e1f..3d25b5f92d 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/SettingsViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/SettingsViewModel.cs
@@ -70,19 +70,10 @@ namespace VECTO3GUI2020.ViewModel.Implementation
{
get
{
- return _closeWindowCommand ?? new RelayCommand<Window>(window => CloseWindow(window, _dialogHelper), window => true);
+ return _closeWindowCommand ?? new RelayCommand<Window>(window => CloseWindow(window, _dialogHelper, false), window => true);
}
}
- private void CloseWindow(Window window, bool ask)
- {
-
- }
-
-
-
-
-
public ICommand ChangeFilePath
{
get
diff --git a/VECTO3GUI2020/Views/SettingsView.xaml b/VECTO3GUI2020/Views/SettingsView.xaml
index 6ef78b6a93..29bf28e274 100644
--- a/VECTO3GUI2020/Views/SettingsView.xaml
+++ b/VECTO3GUI2020/Views/SettingsView.xaml
@@ -103,9 +103,7 @@
Width="100"
Command="{Binding CloseWindowCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
- Style="{DynamicResource MultiStageButtonStyle1}"
- Margin="4"
- Padding="4">Close</Button>
+ Style="{DynamicResource MultiStageButtonStyle1}">Close</Button>
</DockPanel>
</DockPanel>
</Grid>
--
GitLab