Merge remote-tracking branch 'origin/run-configurations'

2 files changed, 14 insertions, 4 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
index a606782e93..49d42c8fd7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockContainer.cs
@@ -84,8 +84,11 @@ namespace MonoDevelop.Components.Docking
 			layout = null;
 		}
 
+		internal bool IsSwitchingLayout { get; set; }
+
 		public void LoadLayout (DockLayout dl)
 		{
+			IsSwitchingLayout = true;
 			HidePlaceholder ();
 
 			// Sticky items currently selected in notebooks will remain
@@ -97,8 +100,8 @@ namespace MonoDevelop.Components.Docking
 					if (gitem != null && gitem.ParentGroup.IsSelectedPage (it))
 						sickyOnTop.Add (it);
 				}
-			}			
-			
+			}
+
 			if (layout != null)
 				layout.StoreAllocation ();
 			layout = dl;
@@ -116,6 +119,8 @@ namespace MonoDevelop.Components.Docking
 
 			foreach (DockItem it in sickyOnTop)
 				it.Present (false);
+
+			IsSwitchingLayout = false;
 		}
 		
 		public void StoreAllocation ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
index ceec861e19..362e168cd6 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.Components.Docking
 		DockVisualStyle itemStyle;
 		DockVisualStyle currentVisualStyle;
 
-		public event EventHandler VisibleChanged;
+		public event EventHandler<VisibilityChangeEventArgs> VisibleChanged;
 		public event EventHandler ContentVisibleChanged;
 		public event EventHandler ContentRequired;
 		
@@ -365,7 +365,7 @@ namespace MonoDevelop.Components.Docking
 			if (vis != lastVisibleStatus) {
 				lastVisibleStatus = vis;
 				if (VisibleChanged != null)
-					VisibleChanged (this, EventArgs.Empty);
+					VisibleChanged (this, new VisibilityChangeEventArgs { SwitchingLayout = frame.Container.IsSwitchingLayout});
 			}
 			UpdateContentVisibleStatus ();
 		}
@@ -587,4 +587,9 @@ namespace MonoDevelop.Components.Docking
 
 		public Gtk.Window DockParent { get; private set; }
 	}
+
+	public class VisibilityChangeEventArgs: EventArgs
+	{
+		public bool SwitchingLayout { get; set; }
+	}
 }