AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Activate Qt::Popup windows

Browse Source 
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>
This commit is contained in:
BogDan Vatra 2016-01-06 14:16:57 +02:00
parent b50f0244c8
commit e9eb32f332
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/android/qandroidplatformscreen.cpp
View File

@ -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;
}