Narvaling
/
OliviaAddInPro
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Gerardo/flagsCierreVentanas' into develop 

# Conflicts:
#	ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs
Elena/develop
Gerardo 2022-05-29 18:41:15 +02:00
parent d5d52a2d78 b9af14a188
commit 8e89563851
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ViewModel/Configuracion/DockpaneConfigViewModel.cs
View File

@ -43,7 +43,10 @@ namespace OliviaAddInPro
pane.Activate(); pane.Activate();
} }
protected override void OnHidden()
{
OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno);
}
internal static void Hide_() internal static void Hide_()
{ {
DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID); DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID);
@ -64,7 +67,7 @@ namespace OliviaAddInPro
if (isVisible == false && !firstTimeShow) if (isVisible == false && !firstTimeShow)
{ {
//avisa de cerrar la ventana //avisa de cerrar la ventana
OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); //OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno);
} }
if (firstTimeShow) if (firstTimeShow)
firstTimeShow = false; firstTimeShow = false;

12
ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs
View File

@ -50,7 +50,7 @@ namespace OliviaAddInPro
DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID); DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID);
if (pane == null) if (pane == null)
return; return;
hideTemp = true; //avisa de que es manual, no por cierre del botón hideTemp = true; //avisa de que solo esconde temporalmente, no para siempre
pane.Hide(); pane.Hide();
} }
@ -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 //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) protected override void OnShow(bool isVisible)
{ {
if (isVisible == false && !firstTimeShow && !hideTemp)
{
//avisa de cerrar la ventana
OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno);
}
if (firstTimeShow) if (firstTimeShow)
firstTimeShow = false; firstTimeShow = false;
} }
protected override void OnHidden()
{
OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno);
}
/// <summary> /// <summary>
/// Text shown near the top of the DockPane. /// Text shown near the top of the DockPane.
/// </summary> /// </summary>

5
ViewModel/Recogida/DockpaneRecogidaViewModel.cs
View File

@ -43,7 +43,10 @@ namespace OliviaAddInPro
hideTemp = false; hideTemp = false;
pane.Activate(); pane.Activate();
} }
protected override void OnHidden()
{
OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno);
}
internal static void Hide_() internal static void Hide_()
{ {
DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID); DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID);