godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #108102 from syntaxerror247/safe-area-bugs 

Android: Fix `DisplayServer.get_display_safe_area()` issues
This commit is contained in:
Thaddeus Crews 2025-07-01 17:57:50 -05:00
parent 2336f566b6 1338e29bf5
commit 098f325e7c
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
View File

@ -53,6 +53,8 @@ import android.view.WindowInsets;
import android.view.WindowManager;
import androidx.core.content.FileProvider;
import androidx.core.graphics.Insets;
import androidx.core.view.WindowInsetsCompat;
import java.io.File;
import java.util.List;
@ -223,25 +225,25 @@ public class GodotIO {
}
if (topView != null) {
topView.getWindowVisibleDisplayFrame(rect);
result[0] = rect.left;
result[1] = rect.top;
result[2] = rect.right;
result[3] = rect.bottom;
int insetTypes = WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
WindowInsets insets = topView.getRootWindowInsets();
DisplayCutout cutout = insets.getDisplayCutout();
if (cutout != null) {
int insetLeft = cutout.getSafeInsetLeft();
int insetTop = cutout.getSafeInsetTop();
result[0] = insetLeft;
result[1] = insetTop;
result[2] -= insetLeft + cutout.getSafeInsetRight();
result[3] -= insetTop + cutout.getSafeInsetBottom();
if (topView.getRootWindowInsets() != null) {
WindowInsetsCompat insetsCompat = WindowInsetsCompat.toWindowInsetsCompat(topView.getRootWindowInsets(), topView);
Insets insets = insetsCompat.getInsets(insetTypes);
if (godot.isInEdgeToEdgeMode()) {
result[0] = insets.left;
result[1] = insets.top;
} else {
// If edge-to-edge mode is disabled, then top and left padding (if required) is already applied.
result[0] = 0;
result[1] = 0;
}
result[2] = topView.getWidth() - insets.right - insets.left;
result[3] = topView.getHeight() - insets.bottom - insets.top;
}
}
return result;
}