From d1945686d5b14741dc485cbb2f3941f25adbc116 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 3 Oct 2008 22:18:06 +0000 Subject: [PATCH] Don't fire ActiveContentChanged event during layout change; prevents unnecessary pad creation. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3579 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs | 2 ++ src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs index d29ba5c30b..e3440b6f7d 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs @@ -234,10 +234,12 @@ namespace ICSharpCode.SharpDevelop.Gui try { IWorkbenchWindow activeWindow = this.ActiveWorkbenchWindow; dockPanel.ActiveDocumentChanged -= new EventHandler(ActiveMdiChanged); + dockPanel.ActiveContentChanged -= new EventHandler(ActiveContentChanged); DetachPadContents(false); DetachViewContents(false); dockPanel.ActiveDocumentChanged += new EventHandler(ActiveMdiChanged); + dockPanel.ActiveContentChanged += new EventHandler(ActiveContentChanged); LoadLayoutConfiguration(); ShowPads(); diff --git a/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs b/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs index 66e2025208..d1aa7ae2b5 100644 --- a/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs +++ b/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs @@ -149,6 +149,7 @@ namespace ICSharpCode.SharpDevelop padContentCreated = true; try { if (addIn != null) { + LoggingService.Debug("Creating pad " + Class + "..."); padContent = (IPadContent)addIn.CreateObject(Class); } else { padContent = (IPadContent)Activator.CreateInstance(padType);