2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-20 21:40:15 -07:00
Code Issues Projects Releases Packages Wiki Activity

- Updated getDisplayMetrics to make use of compilation API level 30.

Browse source 
- The display width is now properly took into account.
- Introduced a ignore notch setting. (design not finished)
- Use proper split screen detection.
- Proper resizing for minecraft view.
- Removed inversion of width and height when the height is greater than the height.
This commit is contained in:
SerpentSpirale 2021-01-29 16:46:26 +01:00
parent 6501b54514
commit 21969090b1
5 changed files with 73 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View file

@ -2,8 +2,6 @@ package net.kdt.pojavlaunch;
import android.app.*;
import android.content.*;
import android.content.res.*;
import android.graphics.Point;
import android.net.*;
import android.os.*;
import android.system.*;
@ -24,6 +22,10 @@ import org.lwjgl.glfw.*;
import android.view.*;
import android.widget.Toast;
import static android.os.Build.VERSION_CODES.P;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_NOTCH_SIZE;
public final class Tools
{
public static final boolean ENABLE_DEV_FEATURES = BuildConfig.DEBUG;
@ -314,7 +316,17 @@ public final class Tools
public static DisplayMetrics getDisplayMetrics(Activity ctx) {
DisplayMetrics displayMetrics = new DisplayMetrics();
ctx.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && (ctx.isInMultiWindowMode() || ctx.isInPictureInPictureMode())){
//For devices with free form/split screen, we need window size, not screen size.
displayMetrics = ctx.getResources().getDisplayMetrics();
}else{
ctx.getDisplay().getRealMetrics(displayMetrics);
if(!PREF_IGNORE_NOTCH){
//Remove notch width when it isn't ignored.
displayMetrics.widthPixels -= PREF_NOTCH_SIZE;
}
}
return displayMetrics;
}
@ -336,22 +348,12 @@ public final class Tools
}
public static DisplayMetrics currentDisplayMetrics;
public static void updateWindowSize(Activity ctx) {
currentDisplayMetrics = getDisplayMetrics(ctx);
Point point = new Point();
ctx.getWindowManager().getDefaultDisplay().getRealSize(point); //Used to get the full screen width/height regardless of a notch/status bar.
currentDisplayMetrics.widthPixels = point.x;
currentDisplayMetrics.heightPixels = point.y;
CallbackBridge.physicalWidth = (int) (currentDisplayMetrics.widthPixels);
CallbackBridge.physicalHeight = (int) (currentDisplayMetrics.heightPixels);
if (CallbackBridge.physicalWidth < CallbackBridge.physicalHeight) {
CallbackBridge.physicalWidth = (int) (currentDisplayMetrics.heightPixels);
CallbackBridge.physicalHeight = (int) (currentDisplayMetrics.widthPixels);
}
}
public static float dpToPx(float dp) {
@ -810,4 +812,17 @@ public final class Tools
}
}
}
public static void ignoreNotch(boolean shouldIgnore, Activity ctx){
if (Build.VERSION.SDK_INT >= P) {
if (shouldIgnore) {
ctx.getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
} else {
ctx.getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
}
ctx.getWindow().setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN, WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
Tools.updateWindowSize(ctx);
}
}
}