From 031d6c16900a3e257682b5e7319492d64c560857 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 21 Dec 2009 12:16:22 +0100
Subject: [PATCH] Don't switch to Help mode if help side bar is already
visible.
---
src/plugins/help/helpplugin.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a7c5eebeb0b..d8a606454ac 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -738,13 +738,15 @@ HelpViewer* HelpPlugin::viewerForContextMode()
{
HelpViewer *viewer = 0;
bool showSideBySide = false;
+ Core::RightPanePlaceHolder* placeHolder = Core::RightPanePlaceHolder::current();
+ Core::IEditor *editor = Core::EditorManager::instance()->currentEditor();
switch (m_helpEngine->customValue(QLatin1String("ContextHelpOption"), 0).toInt())
{
case 0: // side by side if possible
{
- if (Core::IEditor *editor = Core::EditorManager::instance()->currentEditor()) {
- if (editor->widget() && editor->widget()->isVisible() && editor->widget()->width() < 800 )
+ if ((!placeHolder || !placeHolder->isVisible()) && editor) {
+ if (!editor->widget() && editor->widget()->isVisible() && editor->widget()->width() < 800 )
break;
}
}
@@ -756,7 +758,6 @@ HelpViewer* HelpPlugin::viewerForContextMode()
break;
}
- Core::RightPanePlaceHolder* placeHolder = Core::RightPanePlaceHolder::current();
if (placeHolder && showSideBySide) {
Core::RightPaneWidget::instance()->setShown(true);
viewer = m_helpViewerForSideBar;
--
GitLab