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

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

Browse Source
This commit is contained in:
hjk
2008-12-10 16:53:39 +01:00
parent 154121279e e9d9071009
commit 6ae2cc0b5b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -45,6 +45,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout> #include <QtGui/QBoxLayout>
#include <QtGui/QComboBox> #include <QtGui/QComboBox>
#include <QtGui/QTabWidget> #include <QtGui/QTabWidget>
@@ -190,7 +191,14 @@ void ProjectWindow::updateTreeWidget()
// That one runs fully thorough and deletes all widgets, even that one that we are currently removing // That one runs fully thorough and deletes all widgets, even that one that we are currently removing
// from m_panelsTabWidget. // from m_panelsTabWidget.
// To prevent that, we simply prevent the focus switching.... // To prevent that, we simply prevent the focus switching....
m_treeWidget->setFocus(); QWidget *focusWidget = qApp->focusWidget();
while (focusWidget) {
if (focusWidget == this) {
m_treeWidget->setFocus();
break;
}
focusWidget = focusWidget->parentWidget();
}
m_treeWidget->clear(); m_treeWidget->clear();
foreach(Project *project, m_session->projects()) { foreach(Project *project, m_session->projects()) {

4
src/plugins/projectexplorer/session.cpp
View File

@@ -628,8 +628,10 @@ bool SessionManager::loadImpl(const QString &fileName)
if (success) { if (success) {
// restore the active mode // restore the active mode
const QString &modeIdentifier = value(QLatin1String("ActiveMode")).toString(); const QString &modeIdentifier = value(QLatin1String("ActiveMode")).toString();
if (!modeIdentifier.isEmpty()) if (!modeIdentifier.isEmpty()) {
m_core->modeManager()->activateMode(modeIdentifier); m_core->modeManager()->activateMode(modeIdentifier);
m_core->modeManager()->setFocusToCurrentMode();
}
} }
if (debug) if (debug)