DYN-4973-Popups-NotAttached

src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs

@@ -21,11 +21,19 @@ namespace Dynamo.Wpf.UI.GuidedTour
     /// </summary>
     public sealed class GuidesManager
     {
+        /// <summary>
+        /// enum that represent the state of the current guide.
+        /// PLAYING - The Guide has started
+        /// EXIT_MODE - exitGuideWindow Popup is being shown
+        /// STOPPED - The user has exited completely the guide (so no Popup is being shown)
+        /// </summary>
+        internal enum GUIDE_STATE { PLAYING, EXIT_MODE, STOPPED }
         #region private properties
         /// <summary>
         /// currentGuide will contain the Guide being played
         /// </summary>
-        private Guide currentGuide;
+        internal Guide currentGuide;
+        internal GUIDE_STATE currentGuideState;
 
         private GuideBackground guideBackgroundElement;
         private readonly UIElement mainRootElement;
@@ -173,6 +181,7 @@ internal void LaunchTour(string tourName)
             {
                 Initialize();
                 GuideFlowEvents.OnGuidedTourStart(tourName);
+                currentGuideState = GUIDE_STATE.PLAYING;
                 Logging.Analytics.TrackScreenView("InteractiveGuidedTours");
                 Logging.Analytics.TrackEvent(Logging.Actions.Start, Logging.Categories.GuidedTourOperations, Resources.ResourceManager.GetString(currentGuide.GuideNameResource).Replace("_", ""), currentGuide.SequenceOrder);
             }
@@ -214,10 +223,12 @@ private void TourFinished(GuidedTourStateEventArgs args)
                 guideBackgroundElement.ClearHighlightSection();
                 guideBackgroundElement.ClearCutOffSection();
                 CreateExitModal(currentGuide.CurrentStep.ExitGuide);
+                currentGuideState = GUIDE_STATE.EXIT_MODE;
             }
             else
             {
                 ExitTour();
+                currentGuideState = GUIDE_STATE.STOPPED;
             }
         }
 
@@ -278,6 +289,23 @@ internal void CreateExitModal(ExitGuide exitGuide)
             exitGuideWindow.IsOpen = true;
         }
 
+        /// <summary>
+        /// Shows/Hides the Popup based in if the DynamoView is Active or not
+        /// </summary>
+        /// <param name="isActive"></param>
+        internal void ManagePopupActivation(bool isActive)
+        {
+            switch(currentGuideState)
+            {
+                case GUIDE_STATE.PLAYING:
+                    currentGuide.CurrentStep.stepUIPopup.IsOpen = isActive;
+                    break;
+                case GUIDE_STATE.EXIT_MODE:
+                    exitGuideWindow.IsOpen = isActive;
+                    break;
+            }
+        }
+
         private void ContinueTourButton_Click(object sender, RoutedEventArgs e)
         {
             exitGuideWindow.IsOpen = false;
@@ -286,12 +314,14 @@ private void ContinueTourButton_Click(object sender, RoutedEventArgs e)
                 GuideFlowEvents.IsAnyGuideActive = true;
                 currentGuide.ContinueStep(currentGuide.CurrentStep.Sequence);
             }
+            currentGuideState = GUIDE_STATE.PLAYING;
         }
 
         private void ExitTourButton_Click(object sender, RoutedEventArgs e)
         {
             exitGuideWindow.IsOpen = false;
             ExitTour();
+            currentGuideState = GUIDE_STATE.STOPPED;
         }
 
         /// <summary>

src/DynamoCoreWpf/UI/GuidedTour/Step.cs

@@ -179,7 +179,7 @@ internal Popup StepUIPopup
         #endregion
 
         #region Protected Properties
-        protected Popup stepUIPopup;
+        internal Popup stepUIPopup;
         protected Func<bool, bool> validator;
         /// <summary>
         /// This property describe which will be the pointing direction of the tooltip (if is a Welcome or Survey popup then is not used)

src/DynamoCoreWpf/Views/Core/DynamoView.xaml

@@ -30,6 +30,8 @@
         SnapsToDevicePixels="True"
         ResizeMode="CanResizeWithGrip"
         UseLayoutRounding="True"
+        Activated="DynamoView_Activated"
+        Deactivated="DynamoView_Deactivated"
         Style="{DynamicResource DynamoWindowStyle}">
 
     <Window.Resources>

src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs

@@ -42,6 +42,7 @@
 using Dynamo.Wpf.UI.GuidedTour;
 using Dynamo.Wpf.Utilities;
 using Dynamo.Wpf.ViewModels.Core;
+using Dynamo.Wpf.ViewModels.FileTrust;
 using Dynamo.Wpf.Views;
 using Dynamo.Wpf.Views.Debug;
 using Dynamo.Wpf.Views.FileTrust;
@@ -2475,6 +2476,27 @@ private void FileTrustWarning_Click(object sender, RoutedEventArgs e)
             dynViewModel.FileTrustViewModel.ShowWarningPopup = true;
         }
 
+        private void DynamoView_Activated(object sender, EventArgs e)
+        {
+            if (dynamoViewModel.MainGuideManager != null && dynamoViewModel.MainGuideManager.currentGuide != null)
+            {
+                dynamoViewModel.MainGuideManager.ManagePopupActivation(true);
+            }
+
+
+            if (warningPopup != null)
+                warningPopup.ManagePopupActivation(true);
+        }
+
+        private void DynamoView_Deactivated(object sender, EventArgs e)
+        {
+            if (dynamoViewModel.MainGuideManager != null && dynamoViewModel.MainGuideManager.currentGuide != null)
+                dynamoViewModel.MainGuideManager.ManagePopupActivation(false);
+
+            if(warningPopup != null)
+                warningPopup.ManagePopupActivation(false);
+        }
+
         public void Dispose()
         {
             viewExtensionManager.Dispose();

src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml

@@ -369,7 +369,7 @@
                AllowsTransparency="True"
                Opened="OnContextMenuOpened"
                Placement="MousePoint"
-               StaysOpen="True"
+               StaysOpen="False"
                Style="{StaticResource WorkspaceContextMenuStylePopup}">
             <Popup.Resources>
                 <Style TargetType="{x:Type MenuItem}">

src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs

@@ -111,6 +111,7 @@ private void SettingsButton_Click(object sender, RoutedEventArgs e)
         private void CloseFileButton_Click(object sender, RoutedEventArgs e)
         {
             fileTrustWarningViewModel.ShowWarningPopup = false;
+            fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;
             if (dynViewModel.CloseHomeWorkspaceCommand.CanExecute(null))
             {
                 dynViewModel.CloseHomeWorkspaceCommand.Execute(null);
@@ -125,6 +126,7 @@ private void YesButton_Click(object sender, RoutedEventArgs e)
         {
             fileTrustWarningViewModel.AllowOneTimeTrust = true;
             fileTrustWarningViewModel.ShowWarningPopup = false;
+            fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;
             RunSettings.ForceBlockRun = false;
             if (FileTrustWarningCheckBox.IsChecked.Value == true)
             {
@@ -164,6 +166,17 @@ internal void CleanPopup()
             }
         }
 
+        /// <summary>
+        /// This method will show/hide the Popup when the main window is Activated or Deactivated
+        /// </summary>
+        internal void ManagePopupActivation(bool activate)
+        {
+            if (dynViewModel.FileTrustViewModel.ShowWarningPopup == !activate &&
+               !string.IsNullOrEmpty(dynViewModel.FileTrustViewModel.DynFileDirectoryName) &&
+               RunSettings.ForceBlockRun == true)
+                IsOpen = activate;
+        }
+
         private void SetUpPopup()
         {
             if (fileTrustWarningViewModel != null)