godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Merge pull request #107742 from m4gr3d/address_api_35_ui_issues

Browse Source 
Android: Address API 35 UI behavior changes
This commit is contained in:
Rémi Verschelde
2025-06-22 11:59:12 +02:00
parent 6ff0616054 2f4c3d411c
commit 260190c057
9 changed files with 97 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
platform/android/java/lib/src/org/godotengine/godot/Godot.kt
View File

@@ -172,6 +172,7 @@ class Godot private constructor(val context: Context) {
private var commandLine : MutableList<String> = ArrayList<String>()
private var xrMode = XRMode.REGULAR
private val useImmersive = AtomicBoolean(false)
private val isEdgeToEdge = AtomicBoolean(false)
private var useDebugOpengl = false
private var darkMode = false
@@ -235,6 +236,8 @@ class Godot private constructor(val context: Context) {
xrMode = XRMode.OPENXR
} else if (commandLine[i] == "--debug_opengl") {
useDebugOpengl = true
} else if (commandLine[i] == "--edge_to_edge") {
isEdgeToEdge.set(true)
} else if (commandLine[i] == "--fullscreen") {
useImmersive.set(true)
newArgs.add(commandLine[i])
@@ -332,10 +335,45 @@ class Godot private constructor(val context: Context) {
return isNativeInitialized()
}
/**
* Enable edge-to-edge.
*
* Must be called from the UI thread.
*/
@JvmOverloads
fun enableEdgeToEdge(enabled: Boolean, override: Boolean = false) {
val window = getActivity()?.window ?: return
if (!isEdgeToEdge.compareAndSet(!enabled, enabled) && !override) {
return
}
val rootView = window.decorView
WindowCompat.setDecorFitsSystemWindows(window, !(isEdgeToEdge.get() || useImmersive.get()))
if (enabled) {
ViewCompat.setOnApplyWindowInsetsListener(rootView, null)
rootView.setPadding(0, 0, 0, 0)
} else {
val insetType = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
if (rootView.rootWindowInsets != null) {
val windowInsets = WindowInsetsCompat.toWindowInsetsCompat(rootView.rootWindowInsets)
val insets = windowInsets.getInsets(insetType)
rootView.setPadding(insets.left, insets.top, insets.right, insets.bottom)
}
ViewCompat.setOnApplyWindowInsetsListener(rootView) { v: View, insets: WindowInsetsCompat ->
val windowInsets = insets.getInsets(insetType)
v.setPadding(windowInsets.left, windowInsets.top, windowInsets.right, windowInsets.bottom)
WindowInsetsCompat.CONSUMED
}
}
}
/**
* Toggle immersive mode.
* Must be called from the UI thread.
*/
@JvmOverloads
fun enableImmersiveMode(enabled: Boolean, override: Boolean = false) {
val activity = getActivity() ?: return
val window = activity.window ?: return
@@ -344,7 +382,7 @@ class Godot private constructor(val context: Context) {
return
}
WindowCompat.setDecorFitsSystemWindows(window, !enabled)
WindowCompat.setDecorFitsSystemWindows(window, !(isEdgeToEdge.get() || useImmersive.get()))
val controller = WindowInsetsControllerCompat(window, window.decorView)
if (enabled) {
controller.hide(WindowInsetsCompat.Type.systemBars())
@@ -380,6 +418,9 @@ class Godot private constructor(val context: Context) {
@Keep
fun isInImmersiveMode() = useImmersive.get()
@Keep
fun isInEdgeToEdgeMode() = isEdgeToEdge.get()
/**
* Used to complete initialization of the view used by the engine for rendering.
*
@@ -551,7 +592,6 @@ class Godot private constructor(val context: Context) {
renderView?.onActivityResumed()
registerSensorsIfNeeded()
enableImmersiveMode(useImmersive.get(), true)
for (plugin in pluginRegistry.allPlugins) {
plugin.onMainResume()
}
@@ -704,7 +744,6 @@ class Godot private constructor(val context: Context) {
runOnHostThread {
registerSensorsIfNeeded()
enableImmersiveMode(useImmersive.get(), true)
}
for (plugin in pluginRegistry.allPlugins) {