From 19baa077d9d2c3c8c10325ddb04e8f36112e477d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 31 Oct 2023 21:46:30 +0200 Subject: [PATCH] Android: don't call setApplicationDisplayMetrics() from QtNative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not immediately clear why setApplicationDisplayMetrics() is called from within QtNative.startApplication() while it's also called by QtLayout.onSizeChanged(), it seems to be a redundant call when starting the native Qt app because QtLayout takes care of it already. Task-number: QTBUG-115016 Task-number: QTBUG-118077 Change-Id: I54e8af6356226ca5f1b849ef323be9659b9db663 Reviewed-by: Tinja Paavoseppä Reviewed-by: Qt CI Bot --- .../org/qtproject/qt/android/QtDisplayManager.java | 14 +------------- .../jar/src/org/qtproject/qt/android/QtNative.java | 1 - 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java index 9a5dc38478a..2bbe28a331c 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java @@ -38,10 +38,6 @@ public class QtDisplayManager { public static native void handleScreenRemoved(int displayId); // screen methods - private static int m_widthBeforeStart = 0; - private static int m_heightBeforeStart = 0; - - // Keep in sync with QtAndroid::SystemUiVisibility in androidjnimain.h public static final int SYSTEM_UI_VISIBILITY_NORMAL = 0; public static final int SYSTEM_UI_VISIBILITY_FULLSCREEN = 1; @@ -269,19 +265,11 @@ public class QtDisplayManager { refreshRate = display.getRefreshRate(); } - m_widthBeforeStart = width; - m_heightBeforeStart = height; - setDisplayMetrics(maxWidth, maxHeight, insetLeft, insetTop, - m_widthBeforeStart, m_heightBeforeStart, xdpi, ydpi, + width, height, xdpi, ydpi, scaledDensity, density, refreshRate); } - public static void setApplicationDisplayMetrics(Activity activity) - { - setApplicationDisplayMetrics(activity, m_widthBeforeStart, m_heightBeforeStart); - } - public static int getDisplayRotation(Activity activity) { Display display; if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { diff --git a/src/android/jar/src/org/qtproject/qt/android/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/QtNative.java index 78c19c5ed76..4b812121cd2 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtNative.java @@ -291,7 +291,6 @@ public class QtNative @Override public void run() { res[0] = startQtAndroidPlugin(qtParams); - QtDisplayManager.setApplicationDisplayMetrics(m_activity); } }); m_qtThread.post(new Runnable() {