|
|
|
@ -57,6 +57,7 @@ namespace ICSharpCode.FormsDesigner |
|
|
|
Panel p = new Panel(); |
|
|
|
Panel p = new Panel(); |
|
|
|
DesignSurface designSurface; |
|
|
|
DesignSurface designSurface; |
|
|
|
bool disposing; |
|
|
|
bool disposing; |
|
|
|
|
|
|
|
string activeTabName = String.Empty; |
|
|
|
|
|
|
|
|
|
|
|
IDesignerLoaderProvider loaderProvider; |
|
|
|
IDesignerLoaderProvider loaderProvider; |
|
|
|
IDesignerGenerator generator; |
|
|
|
IDesignerGenerator generator; |
|
|
|
@ -340,6 +341,7 @@ namespace ICSharpCode.FormsDesigner |
|
|
|
Reload(); |
|
|
|
Reload(); |
|
|
|
IsFormsDesignerVisible = true; |
|
|
|
IsFormsDesignerVisible = true; |
|
|
|
AddSideBars(); |
|
|
|
AddSideBars(); |
|
|
|
|
|
|
|
SetActiveSideTab(); |
|
|
|
UpdatePropertyPad(); |
|
|
|
UpdatePropertyPad(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -361,6 +363,10 @@ namespace ICSharpCode.FormsDesigner |
|
|
|
PropertyPad.PropertyValueChanged -= PropertyValueChanged; |
|
|
|
PropertyPad.PropertyValueChanged -= PropertyValueChanged; |
|
|
|
propertyContainer.Clear(); |
|
|
|
propertyContainer.Clear(); |
|
|
|
IsFormsDesignerVisible = false; |
|
|
|
IsFormsDesignerVisible = false; |
|
|
|
|
|
|
|
activeTabName = String.Empty; |
|
|
|
|
|
|
|
if (SharpDevelopSideBar.SideBar.ActiveTab != null && ToolboxProvider.SideTabs.Contains(SharpDevelopSideBar.SideBar.ActiveTab)) { |
|
|
|
|
|
|
|
activeTabName = SharpDevelopSideBar.SideBar.ActiveTab.Name; |
|
|
|
|
|
|
|
} |
|
|
|
foreach(AxSideTab tab in ToolboxProvider.SideTabs) { |
|
|
|
foreach(AxSideTab tab in ToolboxProvider.SideTabs) { |
|
|
|
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) { |
|
|
|
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) { |
|
|
|
return; |
|
|
|
return; |
|
|
|
@ -601,5 +607,19 @@ namespace ICSharpCode.FormsDesigner |
|
|
|
} |
|
|
|
} |
|
|
|
SharpDevelopSideBar.SideBar.Refresh(); |
|
|
|
SharpDevelopSideBar.SideBar.Refresh(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SetActiveSideTab() |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (activeTabName.Length == 0) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach(AxSideTab tab in ToolboxProvider.SideTabs) { |
|
|
|
|
|
|
|
if (activeTabName == tab.Name) { |
|
|
|
|
|
|
|
SharpDevelopSideBar.SideBar.ActiveTab = tab; |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|