diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2022-12-21 15:39:44 +0200 |
|---|---|---|
| committer | Samuel Mira <samuel.mira@qt.io> | 2023-01-02 18:09:02 +0200 |
| commit | 470587e7ca9a0c7886c820e2bf20fbded976b16f (patch) | |
| tree | 8c0ad9f8b327f8eea7ae5efcc1505d05d386c3f9 /src/android | |
| parent | aa7b2436b5a357ea7d76eebaecab0c05719b5c91 (diff) | |
Android: Fix UI is scaled smaller than before
The 413593183bbb1137fdc784d98c171d67a167bb32 patch changed the way
how the display metrics are retrieved. By doing so, it was found that
the previous way retrieved the scaledDensity always equal to density.
It is intentional for scaledDensity to be dependent on the font scale
chosen by the user. However, this change altered not only the font scale
but also the layout. This patch will make the layout dependent on the
density instead of the scaledDensity and normalize the way the display
metrics are retrieved among Android versions.
Currently, the fontScale is ignored, QTBUG-109566 will track future
developments.
Fixes: QTBUG-109026
Change-Id: I6adacd17583cbe9bee368af35c50b780872ab222
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 99893a914a821567e10935ffb8be24df7147ccd9)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtLayout.java | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java b/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java index e9fb498611..fa2c841a6c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java @@ -143,11 +143,6 @@ public class QtLayout extends ViewGroup maxWidth = maxMetrics.widthPixels; maxHeight = maxMetrics.heightPixels; - - density = appMetrics.density; - xdpi = appMetrics.xdpi; - ydpi = appMetrics.ydpi; - scaledDensity = appMetrics.scaledDensity; } else { // after API 30 use getCurrentWindowMetrics for application metrics // getMaximumWindowMetrics for the screen metrics @@ -171,18 +166,14 @@ public class QtLayout extends ViewGroup maxWidth = maxMetrics.getBounds().width(); maxHeight = maxMetrics.getBounds().height(); - - final Resources resources = activity.getResources(); - final Configuration configuration = resources.getConfiguration(); - density = configuration.densityDpi / (float) DisplayMetrics.DENSITY_DEFAULT; - - final DisplayMetrics displayMetrics = resources.getDisplayMetrics(); - xdpi = displayMetrics.xdpi; - ydpi = displayMetrics.ydpi; - density = displayMetrics.density; - scaledDensity = displayMetrics.scaledDensity; } + final DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics(); + xdpi = displayMetrics.xdpi; + ydpi = displayMetrics.ydpi; + density = displayMetrics.density; + scaledDensity = displayMetrics.scaledDensity; + float refreshRate = display.getRefreshRate(); if ((appWidth > appHeight) != (w > h)) { |