From ff30cf72b0fae99e52c8ee76c4fdd5280f97498d Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Thu, 28 May 2015 13:30:33 +0200
Subject: [PATCH] Android manifest editor: Set focus when switching tabs
Change-Id: I4fd52b852d274783f679b056842b87ba886ddf90
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
---
.../android/androidmanifesteditorwidget.cpp | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index d71122ef440..6d345c778f7 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -554,19 +554,20 @@ bool AndroidManifestEditorWidget::setActivePage(EditorPage page)
if (page == Source) {
syncToEditor();
- setFocus();
} else {
if (!syncToWidgets())
return false;
-// TODO?
-// QWidget *fw = m_overlayWidget->focusWidget();
-// if (fw && fw != m_overlayWidget)
-// fw->setFocus();
-// else
-// m_packageNameLineEdit->setFocus();
}
setCurrentIndex(page);
+
+ QWidget *cw = currentWidget();
+ if (cw) {
+ if (cw->focusWidget())
+ cw->focusWidget()->setFocus();
+ else
+ cw->setFocus();
+ }
return true;
}
--
GitLab