diff options
| author | Piotr Mikolajczyk <piotr.mikolajczyk@qt.io> | 2020-10-06 11:43:24 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-21 07:08:54 +0000 |
| commit | a02ea26b469a32fbdcd9ce777dd46aeacc5cd82f (patch) | |
| tree | 67bac74df38a5ee604843f7f4e860debf3663576 | |
| parent | 1be271713ebcbca2f2cc1dd8734f2740165dab96 (diff) | |
[Android] Make sure expose events are emitted after window resize
Expose event would not be sent when window was resized
Fixes: QTBUG-69155
Pick-to: 5.15
Change-Id: I81bf2d54f830a0dabf15398e1f25b55ff7ff4479
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp index dff7e6ec54..333fc2a25f 100644 --- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp @@ -107,9 +107,7 @@ void QAndroidPlatformOpenGLWindow::setGeometry(const QRect &rect) QtAndroid::setSurfaceGeometry(m_nativeSurfaceId, rect); QRect availableGeometry = screen()->availableGeometry(); - if (m_oldGeometry.width() == 0 - && m_oldGeometry.height() == 0 - && rect.width() > 0 + if (rect.width() > 0 && rect.height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0) { diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp index cc41a871f3..6a1a51b272 100644 --- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp @@ -84,9 +84,7 @@ void QAndroidPlatformVulkanWindow::setGeometry(const QRect &rect) QtAndroid::setSurfaceGeometry(m_nativeSurfaceId, rect); QRect availableGeometry = screen()->availableGeometry(); - if (m_oldGeometry.width() == 0 - && m_oldGeometry.height() == 0 - && rect.width() > 0 + if (rect.width() > 0 && rect.height() > 0 && availableGeometry.width() > 0 && availableGeometry.height() > 0) { diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index 03defa5884..4c7b15ac74 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -19,9 +19,6 @@ osx windows-10 [testInputEvents] rhel-7.4 -[exposeEventOnShrink_QTBUG54040] -# QTBUG-69155 -android [initialSize] # QTBUG-69159 android |