From 630d74a40c18d56e147909f7c4da641e83a2d0b7 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Thu, 30 Jan 2014 10:22:26 +0200 Subject: Don't add/remove/lower/raise children windows to the TLW stack. Change-Id: I4fe6b05fe2a7d6de7c8ecaf9934fd8e285b2c64e Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/platforms/android/qandroidplatformscreen.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/plugins/platforms/android/qandroidplatformscreen.cpp') diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp index 09d5fc3ca9..96f4a43f1a 100644 --- a/src/plugins/platforms/android/qandroidplatformscreen.cpp +++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp @@ -125,6 +125,9 @@ QWindow *QAndroidPlatformScreen::topLevelAt(const QPoint &p) const void QAndroidPlatformScreen::addWindow(QAndroidPlatformWindow *window) { + if (window->parent()) + return; + m_windowStack.prepend(window); if (window->isRaster()) setDirty(window->geometry()); @@ -136,6 +139,9 @@ void QAndroidPlatformScreen::addWindow(QAndroidPlatformWindow *window) void QAndroidPlatformScreen::removeWindow(QAndroidPlatformWindow *window) { + if (window->parent()) + return; + m_windowStack.removeOne(window); if (window->isRaster()) { setDirty(window->geometry()); @@ -147,6 +153,9 @@ void QAndroidPlatformScreen::removeWindow(QAndroidPlatformWindow *window) void QAndroidPlatformScreen::raise(QAndroidPlatformWindow *window) { + if (window->parent()) + return; + int index = m_windowStack.indexOf(window); if (index <= 0) return; @@ -161,6 +170,9 @@ void QAndroidPlatformScreen::raise(QAndroidPlatformWindow *window) void QAndroidPlatformScreen::lower(QAndroidPlatformWindow *window) { + if (window->parent()) + return; + int index = m_windowStack.indexOf(window); if (index == -1 || index == (m_windowStack.size() - 1)) return; -- cgit v1.2.3