From 7996a9fb3a67a2694956be10b8c49bd740b14ae8 Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Sat, 26 Nov 2005 18:32:14 +0000
Subject: [PATCH] Fixed SD2-587.  Windows forms component sidebars recreated if
 they do not exist when switching to an already opened forms designer.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@805 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../FormDesigner/FormDesignerViewContent.cs   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
index 2a468dd339..220469fe4f 100644
--- a/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs
@@ -111,6 +111,14 @@ namespace ICSharpCode.FormDesigner
 			
 			this.viewContent             = viewContent;
 			this.textAreaControlProvider = viewContent as ITextEditorControlProvider;
+			
+		}
+		
+		public override void SwitchedTo()
+		{
+			if (IsFormDesignerVisible) {
+				AddSideBars();
+			}
 		}
 		
 		void LoadDesigner()
@@ -266,12 +274,7 @@ namespace ICSharpCode.FormDesigner
 			PropertyPad.PropertyValueChanged += PropertyValueChanged;
 			Reload();
 			IsFormDesignerVisible = true;
-			foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
-				if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
-					SharpDevelopSideBar.SideBar.Tabs.Add(tab);
-				}
-			}
-			SharpDevelopSideBar.SideBar.Refresh();
+			AddSideBars();
 			propertyContainer.Host = Host;
 			UpdateSelectableObjects();
 		}
@@ -504,5 +507,15 @@ namespace ICSharpCode.FormDesigner
 				}
 			}
 		}
+		
+		void AddSideBars()
+		{
+			foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
+				if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
+					SharpDevelopSideBar.SideBar.Tabs.Add(tab);
+				}
+			}
+			SharpDevelopSideBar.SideBar.Refresh();
+		}
 	}
 }