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

Android: remove unused scaled density property

Browse Source 
This value is used by nothing throughout the Qt Android code.

Task-number: QTBUG-132716
Change-Id: I694d016131b7eccd9ea5789e77f0501676a7f21a
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
This commit is contained in:
Assam Boudjelthia 2025-01-06 18:12:27 +02:00
parent c13e2213a8
commit 4d5a5d502f
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java
View File

@ -34,7 +34,7 @@ class QtDisplayManager {
// screen methods // screen methods
static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels, static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,
int availableWidthPixels, int availableHeightPixels, int availableWidthPixels, int availableHeightPixels,
double XDpi, double YDpi, double scaledDensity, double XDpi, double YDpi,
double density); double density);
static native void handleOrientationChanged(int newRotation, int nativeOrientation); static native void handleOrientationChanged(int newRotation, int nativeOrientation);
static native void handleRefreshRateChanged(float refreshRate); static native void handleRefreshRateChanged(float refreshRate);
@ -279,13 +279,12 @@ class QtDisplayManager {
final DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics(); final DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics();
double density = displayMetrics.density; double density = displayMetrics.density;
double scaledDensity = displayMetrics.scaledDensity;
Size displaySize = getDisplaySize(activity, QtDisplayManager.getDisplay(activity)); Size displaySize = getDisplaySize(activity, QtDisplayManager.getDisplay(activity));
setDisplayMetrics(displaySize.getWidth(), displaySize.getHeight(), setDisplayMetrics(displaySize.getWidth(), displaySize.getHeight(),
width, height, width, height,
getXDpi(displayMetrics), getYDpi(displayMetrics), getXDpi(displayMetrics), getYDpi(displayMetrics),
scaledDensity, density); density);
} }
static float getXDpi(final DisplayMetrics metrics) { static float getXDpi(final DisplayMetrics metrics) {

2
src/android/jar/src/org/qtproject/qt/android/QtServiceEmbeddedDelegate.java
View File

@ -45,7 +45,7 @@ class QtServiceEmbeddedDelegate implements QtEmbeddedViewInterface, QtNative.App
QtDisplayManager.setDisplayMetrics( QtDisplayManager.setDisplayMetrics(
maxWidth, maxHeight, maxWidth, maxHeight, maxWidth, maxHeight, maxWidth, maxHeight,
QtDisplayManager.getXDpi(metrics), QtDisplayManager.getYDpi(metrics), QtDisplayManager.getXDpi(metrics), QtDisplayManager.getYDpi(metrics),
metrics.scaledDensity, metrics.density); metrics.density);
QtDisplayManager.updateRefreshRate(m_service); QtDisplayManager.updateRefreshRate(m_service);
}); });

9
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -76,7 +76,6 @@ static QAndroidPlatformIntegration *m_androidPlatformIntegration = nullptr;
static int m_availableWidthPixels = 0; static int m_availableWidthPixels = 0;
static int m_availableHeightPixels = 0; static int m_availableHeightPixels = 0;
static double m_scaledDensity = 0;
static double m_density = 1.0; static double m_density = 1.0;
static AndroidAssetsFileEngineHandler *m_androidAssetsFileEngineHandler = nullptr; static AndroidAssetsFileEngineHandler *m_androidAssetsFileEngineHandler = nullptr;
@ -154,11 +153,6 @@ namespace QtAndroid
return m_availableHeightPixels; return m_availableHeightPixels;
} }
double scaledDensity()
{
return m_scaledDensity;
}
double pixelDensity() double pixelDensity()
{ {
return m_density; return m_density;
@ -575,11 +569,10 @@ static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/,
jint screenWidthPixels, jint screenHeightPixels, jint screenWidthPixels, jint screenHeightPixels,
jint availableWidthPixels, jint availableHeightPixels, jint availableWidthPixels, jint availableHeightPixels,
jdouble xdpi, jdouble ydpi, jdouble xdpi, jdouble ydpi,
jdouble scaledDensity, jdouble density) jdouble density)
{ {
m_availableWidthPixels = availableWidthPixels; m_availableWidthPixels = availableWidthPixels;
m_availableHeightPixels = availableHeightPixels; m_availableHeightPixels = availableHeightPixels;
m_scaledDensity = scaledDensity;
m_density = density; m_density = density;
const QSize screenSize(screenWidthPixels, screenHeightPixels); const QSize screenSize(screenWidthPixels, screenHeightPixels);

1
src/plugins/platforms/android/androidjnimain.h
View File

@ -43,7 +43,6 @@ namespace QtAndroid
QWindow *windowFromId(int windowId); QWindow *windowFromId(int windowId);
int availableWidthPixels(); int availableWidthPixels();
int availableHeightPixels(); int availableHeightPixels();
double scaledDensity();
double pixelDensity(); double pixelDensity();
jobject assets(); jobject assets();
AAssetManager *assetManager(); AAssetManager *assetManager();