From 19e02154945acd0600d5d9180f4256429d6815f7 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 19 Aug 2014 19:03:32 +0200 Subject: [PATCH] UnconfiguredPanel: Ensure that "Return" on initial show accepts Task-number: QTCREATORBUG-12827 Change-Id: Ie68228433b8c76f48361ed642f932ded0d7f2b72 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/projectpanelfactory.h | 4 +++- src/plugins/projectexplorer/projectwindow.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/projectpanelfactory.h b/src/plugins/projectexplorer/projectpanelfactory.h index d6f6b4d641a..a26c99e0273 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.h +++ b/src/plugins/projectexplorer/projectpanelfactory.h @@ -72,10 +72,12 @@ public: m_createWidgetFunction = [icon, this](Project *project) -> QWidget * { PropertiesPanel *panel = new PropertiesPanel; panel->setDisplayName(this->displayName()); - panel->setWidget(new T(project)), + QWidget *widget = new T(project); + panel->setWidget(widget); panel->setIcon(icon); PanelsWidget *panelsWidget = new PanelsWidget(); panelsWidget->addPropertiesPanel(panel); + panelsWidget->setFocusProxy(widget); return panelsWidget; }; } diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index ec110091b26..b02f8e555b2 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -235,7 +235,8 @@ void ProjectWindow::showProperties(int index, int subIndex) m_currentWidget = widget; m_centralWidget->addWidget(m_currentWidget); m_centralWidget->setCurrentWidget(m_currentWidget); - + if (hasFocus()) // we get assigned focus from setFocusToCurrentMode, pass that on + m_currentWidget->setFocus(); } SessionManager::setStartupProject(project);