feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/1.3'

Browse Source
This commit is contained in:
con
2010-01-05 10:58:06 +01:00
parent 8929bb27ee cf8b5704d0
commit 7185e42b25
12 changed files with 318 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/help/helpplugin.cpp
View File

@@ -746,13 +746,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;
}
}
@@ -764,7 +766,6 @@ HelpViewer* HelpPlugin::viewerForContextMode()
break;
}
Core::RightPanePlaceHolder* placeHolder = Core::RightPanePlaceHolder::current();
if (placeHolder && showSideBySide) {
Core::RightPaneWidget::instance()->setShown(true);
viewer = m_helpViewerForSideBar;