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

We need to create the right pane also in case we handle a help request.

Browse Source
This commit is contained in:
kh1
2010-03-16 19:31:29 +01:00
parent d849652700
commit 54be2fed8a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,7 +485,7 @@ bool HelpPlugin::unregisterDocumentation(const QStringList &nameSpaces)
return needsSetup; return needsSetup;
} }
void HelpPlugin::createRightPaneSideBar() void HelpPlugin::createRightPaneContextViewer()
{ {
if (m_helpViewerForSideBar) if (m_helpViewerForSideBar)
return; return;
@@ -855,10 +855,12 @@ HelpViewer* HelpPlugin::viewerForContextMode()
HelpViewer *viewer = m_centralWidget->currentHelpViewer(); HelpViewer *viewer = m_centralWidget->currentHelpViewer();
if (placeHolder && showSideBySide) { if (placeHolder && showSideBySide) {
RightPaneWidget::instance()->setShown(true); RightPaneWidget::instance()->setShown(true);
createRightPaneContextViewer();
viewer = m_helpViewerForSideBar; viewer = m_helpViewerForSideBar;
} else { } else {
activateHelpMode(); activateHelpMode();
if (!viewer && m_centralWidget) if (!viewer)
viewer = m_centralWidget->newEmptyTab(); viewer = m_centralWidget->newEmptyTab();
} }
return viewer; return viewer;
@@ -867,9 +869,7 @@ HelpViewer* HelpPlugin::viewerForContextMode()
void HelpPlugin::activateContext() void HelpPlugin::activateContext()
{ {
using namespace Core; using namespace Core;
createRightPaneContextViewer();
if (!m_helpViewerForSideBar)
createRightPaneSideBar();
RightPanePlaceHolder* placeHolder = RightPanePlaceHolder::current(); RightPanePlaceHolder* placeHolder = RightPanePlaceHolder::current();
if (placeHolder && m_helpViewerForSideBar->hasFocus()) { if (placeHolder && m_helpViewerForSideBar->hasFocus()) {

2
src/plugins/help/helpplugin.h
View File

@@ -140,7 +140,7 @@ private:
private: private:
QToolBar *createToolBar(); QToolBar *createToolBar();
void createRightPaneSideBar(); void createRightPaneContextViewer();
void activateHelpMode(); void activateHelpMode();
HelpViewer* viewerForContextMode(); HelpViewer* viewerForContextMode();