Commit c6d8d4be authored by Eike Ziller's avatar Eike Ziller
Browse files

Help: Fix initial state of side bar and external window size



In the case of clean settings.

Change-Id: Ie230cc6a20a932c5917c4a9af26f94c0292e5ada
Task-number: QTCREATORBUG-13197
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent f07b876a
...@@ -362,7 +362,9 @@ HelpViewer *HelpPlugin::externalHelpViewer() ...@@ -362,7 +362,9 @@ HelpViewer *HelpPlugin::externalHelpViewer()
QSettings *settings = Core::ICore::settings(); QSettings *settings = Core::ICore::settings();
m_externalWindowState = settings->value(QLatin1String(kExternalWindowStateKey)).toRect(); m_externalWindowState = settings->value(QLatin1String(kExternalWindowStateKey)).toRect();
} }
if (!m_externalWindowState.isNull()) if (m_externalWindowState.isNull())
m_externalWindow->resize(650, 700);
else
m_externalWindow->setGeometry(m_externalWindowState); m_externalWindow->setGeometry(m_externalWindowState);
m_externalWindow->show(); m_externalWindow->show();
m_externalWindow->setFocus(); m_externalWindow->setFocus();
......
...@@ -373,6 +373,7 @@ void HelpWidget::addSideBar() ...@@ -373,6 +373,7 @@ void HelpWidget::addSideBar()
m_sideBarSplitter->insertWidget(0, m_sideBar); m_sideBarSplitter->insertWidget(0, m_sideBar);
m_sideBarSplitter->setStretchFactor(0, 0); m_sideBarSplitter->setStretchFactor(0, 0);
m_sideBarSplitter->setStretchFactor(1, 1); m_sideBarSplitter->setStretchFactor(1, 1);
if (m_style != ModeWidget)
m_sideBar->setVisible(false); m_sideBar->setVisible(false);
m_sideBar->resize(250, size().height()); m_sideBar->resize(250, size().height());
m_sideBar->readSettings(Core::ICore::settings(), sideBarSettingsKey()); m_sideBar->readSettings(Core::ICore::settings(), sideBarSettingsKey());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment