Fix context help for examples

- createRightPaneContextViewer() needs to be called up-front. In the old
order, it would fail the first time.

- Queue opening of help, because we need the editor window to be drawn
  before it can be assessed wether to show the help in split mode

Change-Id: Ib2054285efb07ccbfaf3faf089085c16ba432be8
Reviewed-on: http://codereview.qt.nokia.com/22
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Daniel Molkentin
2011-05-19 17:14:53 +02:00
committed by Daniel Teske
parent ced48beb6f
commit c86e81c362
2 changed files with 7 additions and 3 deletions

View File

@@ -838,9 +838,9 @@ HelpViewer* HelpPlugin::viewerForContextMode()
}
if (placeHolder && showSideBySide) {
createRightPaneContextViewer();
RightPaneWidget::instance()->setWidget(m_rightPaneSideBarWidget);
RightPaneWidget::instance()->setShown(true);
createRightPaneContextViewer();
return m_helpViewerForSideBar;
}

View File

@@ -439,8 +439,12 @@ void GettingStartedWelcomePageWidget::slotOpenExample()
}
if (ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFile)) {
Core::ICore::instance()->openFiles(files);
if (!helpFile.isEmpty())
slotOpenContextHelpPage(helpFile);
if (!helpFile.isEmpty()) {
// queue this to make sure it gets executed after the editor widget
// has been drawn, so we know whether to show a split help or not
QMetaObject::invokeMethod(this, "slotOpenContextHelpPage",
Qt::QueuedConnection, Q_ARG(QString, helpFile));
}
}
}