diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-01-06 14:16:57 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2016-01-06 18:17:04 +0000 |
| commit | e9eb32f332561847e11ada14fd04c919b91d3511 (patch) | |
| tree | fb4859b089f332b10a6ca30206455bab7b3a5fad /src/plugins/platforms/android/qandroidplatformscreen.cpp | |
| parent | b50f0244c8f1b8e229a71018f39ac373d0ba6a1e (diff) | |
Android: Activate Qt::Popup windows
On Android, back button will send a CloseEvent to the focused window.
This change will activate (focus) the Popup windows when they'll become
visible.
Task-number: QTBUG-46419
Change-Id: I6787435b24502bbf9a78662a0c6fd159d4ee2e8d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformscreen.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformscreen.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index 209ce2f7db..8152f1d53f 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -111,9 +111,13 @@ QAndroidPlatformScreen::~QAndroidPlatformScreen() QWindow *QAndroidPlatformScreen::topWindow() const { - foreach (QAndroidPlatformWindow *w, m_windowStack) - if (w->window()->type() == Qt::Window || w->window()->type() == Qt::Dialog) + foreach (QAndroidPlatformWindow *w, m_windowStack) { + if (w->window()->type() == Qt::Window || + w->window()->type() == Qt::Popup || + w->window()->type() == Qt::Dialog) { return w->window(); + } + } return 0; } |