1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix UI is scaled smaller than before

Browse Source 
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 Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuel Mira 2022-12-21 15:39:44 +02:00 committed by Qt Cherry-pick Bot
parent 9242363fa6
commit c020e5fef7
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/android/jar/src/org/qtproject/qt/android/QtLayout.java
View File

@ -109,11 +109,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
@ -138,17 +133,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)) {

2
src/plugins/platforms/android/qandroidplatformscreen.cpp
View File

@ -466,7 +466,7 @@ static const int androidLogicalDpi = 72;
QDpi QAndroidPlatformScreen::logicalDpi() const
{
qreal lDpi = QtAndroid::scaledDensity() * androidLogicalDpi;
qreal lDpi = QtAndroid::pixelDensity() * androidLogicalDpi;
return QDpi(lDpi, lDpi);
}