From a02ea26b469a32fbdcd9ce777dd46aeacc5cd82f Mon Sep 17 00:00:00 2001 From: Piotr Mikolajczyk Date: Tue, 6 Oct 2020 11:43:24 +0200 Subject: [Android] Make sure expose events are emitted after window resize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø Reviewed-by: Rami Potinkara Reviewed-by: Andy Shaw Reviewed-by: Heikki Halmet --- src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | 4 +--- src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/plugins/platforms') 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) { -- cgit v1.2.3