diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-10-31 21:46:30 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-11-10 21:57:11 +0200 |
| commit | 19baa077d9d2c3c8c10325ddb04e8f36112e477d (patch) | |
| tree | 308cb2a089a22743fce022fe76208a6e5ea072a8 /src/android/jar/src/org/qtproject | |
| parent | 23499e78411450d3d06b920d72c9b9bc28afd766 (diff) | |
Android: don't call setApplicationDisplayMetrics() from QtNative
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ä <tinja.paavoseppa@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/android/jar/src/org/qtproject')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java | 14 | ||||
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt/android/QtNative.java | 1 |
2 files changed, 1 insertions, 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 9a5dc38478..2bbe28a331 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 78c19c5ed7..4b812121cd 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() { |