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

Android: remove unused top/left inset params of setDisplayMetrics()

Browse Source 
Those two params are already marked as unused, so there's no point in
calculating them passing them and then not using them.

Task-number: QTBUG-132716
Change-Id: I840473a42ac4256164252df805b52b859d2fa3de
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
This commit is contained in:
Assam Boudjelthia 2025-01-06 17:05:32 +02:00
parent 97605760ae
commit c13e2213a8
3 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ class QtDisplayManager {
// screen methods // screen methods
static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels, static native void setDisplayMetrics(int screenWidthPixels, int screenHeightPixels,
int availableLeftPixels, int availableTopPixels,
int availableWidthPixels, int availableHeightPixels, int availableWidthPixels, int availableHeightPixels,
double XDpi, double YDpi, double scaledDensity, double XDpi, double YDpi, double scaledDensity,
double density); double density);
@ -277,27 +276,15 @@ class QtDisplayManager {
if (activity == null) if (activity == null)
return; return;
final WindowInsets rootInsets = activity.getWindow().getDecorView().getRootWindowInsets();
int insetLeft;
int insetTop;
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
insetLeft = rootInsets.getStableInsetLeft();
insetTop = rootInsets.getStableInsetTop();
} else {
insetLeft = rootInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars()).left;
insetTop = rootInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars()).top;
}
final DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics(); final DisplayMetrics displayMetrics = activity.getResources().getDisplayMetrics();
double density = displayMetrics.density; double density = displayMetrics.density;
double scaledDensity = displayMetrics.scaledDensity; double scaledDensity = displayMetrics.scaledDensity;
Size displaySize = getDisplaySize(activity, QtDisplayManager.getDisplay(activity)); Size displaySize = getDisplaySize(activity, QtDisplayManager.getDisplay(activity));
setDisplayMetrics(displaySize.getWidth(), displaySize.getHeight(), insetLeft, insetTop, setDisplayMetrics(displaySize.getWidth(), displaySize.getHeight(),
width, height, getXDpi(displayMetrics), getYDpi(displayMetrics), width, height,
getXDpi(displayMetrics), getYDpi(displayMetrics),
scaledDensity, density); scaledDensity, density);
} }

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

@ -41,11 +41,9 @@ class QtServiceEmbeddedDelegate implements QtEmbeddedViewInterface, QtNative.App
final int maxWidth = metrics.widthPixels; final int maxWidth = metrics.widthPixels;
final int maxHeight = metrics.heightPixels; final int maxHeight = metrics.heightPixels;
final int insetLeft = 0;
final int insetTop = 0;
QtDisplayManager.setDisplayMetrics( QtDisplayManager.setDisplayMetrics(
maxWidth, maxHeight, insetLeft, insetTop, maxWidth, maxHeight, maxWidth, maxHeight, maxWidth, maxHeight,
QtDisplayManager.getXDpi(metrics), QtDisplayManager.getYDpi(metrics), QtDisplayManager.getXDpi(metrics), QtDisplayManager.getYDpi(metrics),
metrics.scaledDensity, metrics.density); metrics.scaledDensity, metrics.density);

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

@ -571,15 +571,12 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/)
sem_post(&m_exitSemaphore); sem_post(&m_exitSemaphore);
} }
static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/, jint screenWidthPixels, static void setDisplayMetrics(JNIEnv * /*env*/, jclass /*clazz*/,
jint screenHeightPixels, jint availableLeftPixels, jint screenWidthPixels, jint screenHeightPixels,
jint availableTopPixels, jint availableWidthPixels, jint availableWidthPixels, jint availableHeightPixels,
jint availableHeightPixels, jdouble xdpi, jdouble ydpi, jdouble xdpi, jdouble ydpi,
jdouble scaledDensity, jdouble density) jdouble scaledDensity, jdouble density)
{ {
Q_UNUSED(availableLeftPixels)
Q_UNUSED(availableTopPixels)
m_availableWidthPixels = availableWidthPixels; m_availableWidthPixels = availableWidthPixels;
m_availableHeightPixels = availableHeightPixels; m_availableHeightPixels = availableHeightPixels;
m_scaledDensity = scaledDensity; m_scaledDensity = scaledDensity;