Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 9 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs
index 77fad1fc6..96715dc20 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/StudioViewModel.cs
@@ -15,6 +15,8 @@ namespace Tango.MachineStudio.Common
     /// <seealso cref="Tango.MachineStudio.Common.IStudioViewModel" />
     public abstract class StudioViewModelInternal : ViewModel, IStudioViewModel
     {
+        public bool IsVisible { get; private set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this view model studio module is currently loaded.
         /// </summary>
@@ -42,6 +44,7 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public virtual void OnNavigatedFrom()
         {
+            IsVisible = false;
             IsModuleLoaded = false;
         }
 
@@ -50,6 +53,7 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public virtual void OnNavigatedTo()
         {
+            IsVisible = true;
             IsModuleLoaded = true;
         }
 
@@ -88,6 +92,8 @@ namespace Tango.MachineStudio.Common
     /// <seealso cref="Tango.MachineStudio.Common.IStudioViewModel" />
     public abstract class StudioViewModel<Module> : ViewModel, IStudioViewModel where Module : IStudioModule
     {
+        public bool IsVisible { get; private set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this view model studio module is currently loaded.
         /// </summary>
@@ -115,6 +121,7 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public virtual void OnNavigatedFrom()
         {
+            IsVisible = false;
             IsModuleLoaded = false;
         }
 
@@ -123,6 +130,7 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public virtual void OnNavigatedTo()
         {
+            IsVisible = true;
             IsModuleLoaded = true;
         }
 
@@ -149,7 +157,7 @@ namespace Tango.MachineStudio.Common
         /// </summary>
         public virtual void OnApplicationStarted()
         {
-            
+
         }
     }