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

UnconfiguredPanel: Ensure that "Return" on initial show accepts

Browse Source 
Task-number: QTCREATORBUG-12827
Change-Id: Ie68228433b8c76f48361ed642f932ded0d7f2b72
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-08-19 19:03:32 +02:00
parent 5ac6fccde9
commit 19e0215494
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/projectpanelfactory.h
View File

@@ -72,10 +72,12 @@ public:
m_createWidgetFunction = [icon, this](Project *project) -> QWidget * { m_createWidgetFunction = [icon, this](Project *project) -> QWidget * {
PropertiesPanel *panel = new PropertiesPanel; PropertiesPanel *panel = new PropertiesPanel;
panel->setDisplayName(this->displayName()); panel->setDisplayName(this->displayName());
panel->setWidget(new T(project)), QWidget *widget = new T(project);
panel->setWidget(widget);
panel->setIcon(icon); panel->setIcon(icon);
PanelsWidget *panelsWidget = new PanelsWidget(); PanelsWidget *panelsWidget = new PanelsWidget();
panelsWidget->addPropertiesPanel(panel); panelsWidget->addPropertiesPanel(panel);
panelsWidget->setFocusProxy(widget);
return panelsWidget; return panelsWidget;
}; };
} }

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

@@ -235,7 +235,8 @@ void ProjectWindow::showProperties(int index, int subIndex)
m_currentWidget = widget; m_currentWidget = widget;
m_centralWidget->addWidget(m_currentWidget); m_centralWidget->addWidget(m_currentWidget);
m_centralWidget->setCurrentWidget(m_currentWidget); m_centralWidget->setCurrentWidget(m_currentWidget);
if (hasFocus()) // we get assigned focus from setFocusToCurrentMode, pass that on
m_currentWidget->setFocus();
} }
SessionManager::setStartupProject(project); SessionManager::setStartupProject(project);