From b9af14a1880a3b14bf2e1ac574ecc64e12fa9608 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Sun, 29 May 2022 18:38:25 +0200 Subject: [PATCH] Flag cierre de ventanas --- ViewModel/Configuracion/DockpaneConfigViewModel.cs | 7 +++++-- ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs | 10 ++++------ ViewModel/Recogida/DockpaneRecogidaViewModel.cs | 5 ++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ViewModel/Configuracion/DockpaneConfigViewModel.cs b/ViewModel/Configuracion/DockpaneConfigViewModel.cs index ebf32d7..c724f39 100644 --- a/ViewModel/Configuracion/DockpaneConfigViewModel.cs +++ b/ViewModel/Configuracion/DockpaneConfigViewModel.cs @@ -43,7 +43,10 @@ namespace OliviaAddInPro pane.Activate(); } - + protected override void OnHidden() + { + OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + } internal static void Hide_() { DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID); @@ -64,7 +67,7 @@ namespace OliviaAddInPro if (isVisible == false && !firstTimeShow) { //avisa de cerrar la ventana - OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + //OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); } if (firstTimeShow) firstTimeShow = false; diff --git a/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs b/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs index 814e8a6..7ba6902 100644 --- a/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs +++ b/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs @@ -63,15 +63,13 @@ namespace OliviaAddInPro //The parameter passed to this method will be true if the Dockpane is being opened and it is false when you close the dockpane protected override void OnShow(bool isVisible) { - /*if (isVisible == false && !firstTimeShow && !hideTemp) - { - //avisa de cerrar la ventana - OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); - }*/ if (firstTimeShow) firstTimeShow = false; } - + protected override void OnHidden() + { + OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + } /// /// Text shown near the top of the DockPane. /// diff --git a/ViewModel/Recogida/DockpaneRecogidaViewModel.cs b/ViewModel/Recogida/DockpaneRecogidaViewModel.cs index 513f754..47c89d3 100644 --- a/ViewModel/Recogida/DockpaneRecogidaViewModel.cs +++ b/ViewModel/Recogida/DockpaneRecogidaViewModel.cs @@ -43,7 +43,10 @@ namespace OliviaAddInPro hideTemp = false; pane.Activate(); } - + protected override void OnHidden() + { + OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + } internal static void Hide_() { DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID);