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

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

Browse Source 
In the case of clean settings.

Change-Id: Ie230cc6a20a932c5917c4a9af26f94c0292e5ada
Task-number: QTCREATORBUG-13197
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Eike Ziller
2014-10-17 16:29:56 +02:00
parent f07b876a93
commit c6d8d4bee4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();

3
src/plugins/help/helpwidget.cpp
View File

@@ -373,7 +373,8 @@ 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);
m_sideBar->setVisible(false); if (m_style != ModeWidget)
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());
m_sideBarSplitter->setSizes(QList<int>() << m_sideBar->size().width() << 300); m_sideBarSplitter->setSizes(QList<int>() << m_sideBar->size().width() << 300);