nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-07 11:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115434 from syntaxerror247/landscape-or-portrait

Browse Source 
Add device orientation change signal to DisplayServer
This commit is contained in:
Thaddeus Crews
2026-01-27 15:18:22 -06:00
parent 0f8a709768 e2369a834b
commit ea1e6640f0
7 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/classes/DisplayServer.xml
View File

@@ -2533,6 +2533,16 @@
</description>
</method>
</methods>
<signals>
<signal name="orientation_changed">
<param index="0" name="orientation" type="int" />
<description>
Emitted when the device orientation changes. [param orientation] is the new orientation.
Returns [code]1[/code] for portrait, [code]2[/code] for landscape, and [code]0[/code] if the orientation is undefined.
[b]Note:[/b] This method is implemented on Android and iOS.
</description>
</signal>
</signals>
<constants>
<constant name="FEATURE_GLOBAL_MENU" value="0" enum="Feature" deprecated="Use [NativeMenu] or [PopupMenu] instead.">
Display server supports global menu. This allows the application to display its menu items in the operating system's top bar. [b]macOS[/b]

11
drivers/apple_embedded/godot_view_controller.mm
View File

@@ -253,6 +253,17 @@
if (camera_server) {
camera_server->handle_display_rotation_change((int)orientation);
}
DisplayServer *display_server = DisplayServer::get_singleton();
if (display_server) {
int out = 0;
if (UIInterfaceOrientationIsPortrait(orientation)) {
out = 1;
} else if (UIInterfaceOrientationIsLandscape(orientation)) {
out = 2;
}
display_server->emit_signal("orientation_changed", out);
}
}];
}
#endif

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

@@ -175,7 +175,6 @@ class Godot private constructor(val context: Context) {
*/
private var renderViewInitialized = false
private var primaryHost: GodotHost? = null
private var currentConfig = context.resources.configuration
/**
* Tracks whether we're in the RESUMED lifecycle state.
@@ -197,6 +196,7 @@ class Godot private constructor(val context: Context) {
private var useDebugOpengl = false
private var darkMode = false
private var backgroundColor: Int = Color.BLACK
private var orientation = Configuration.ORIENTATION_UNDEFINED
internal var containerLayout: FrameLayout? = null
var renderView: GodotRenderView? = null
@@ -234,7 +234,9 @@ class Godot private constructor(val context: Context) {
Log.v(TAG, "InitEngine with params: $commandLineParams")
darkMode = context.resources?.configuration?.uiMode?.and(Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
val config = context.resources.configuration
darkMode = (config.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
orientation = config.orientation
beginBenchmarkMeasure("Startup", "Godot::initEngine")
try {
@@ -770,12 +772,12 @@ class Godot private constructor(val context: Context) {
}
}
if (currentConfig.orientation != newConfig.orientation) {
if (orientation != newConfig.orientation) {
orientation = newConfig.orientation
runOnRenderThread {
GodotLib.onScreenRotationChange(newConfig.orientation)
GodotLib.onOrientationChange(orientation)
}
}
currentConfig = newConfig
}
/**

2
platform/android/java/lib/src/main/java/org/godotengine/godot/GodotLib.java
View File

@@ -302,7 +302,7 @@ public class GodotLib {
* Invoked when the screen orientation changes.
* @param orientation the new screen orientation
*/
static native void onScreenRotationChange(int orientation);
static native void onOrientationChange(int orientation);
/**
* @return true if input must be dispatched from the render thread. If false, input is

7
platform/android/java_godot_lib_jni.cpp
View File

@@ -662,7 +662,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIE
}
}
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz, jint p_orientation) {
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onOrientationChange(JNIEnv *env, jclass clazz, jint p_orientation) {
if (step.get() <= STEP_SETUP) {
return;
}
@@ -671,6 +671,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChang
if (camera_server) {
camera_server->handle_display_rotation_change(p_orientation);
}
DisplayServer *display_server = DisplayServer::get_singleton();
if (display_server) {
display_server->emit_signal("orientation_changed", p_orientation);
}
}
JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) {

2
platform/android/java_godot_lib_jni.h
View File

@@ -72,7 +72,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hardwareKeyboardConne
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onScreenRotationChange(JNIEnv *env, jclass clazz, jint p_orientation);
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onOrientationChange(JNIEnv *env, jclass clazz, jint p_orientation);
JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz);
JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getProjectResourceDir(JNIEnv *env, jclass clazz);
JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz);

2
servers/display/display_server.cpp
View File

@@ -1286,6 +1286,8 @@ void DisplayServer::unregister_additional_output(Object *p_object) {
}
void DisplayServer::_bind_methods() {
ADD_SIGNAL(MethodInfo("orientation_changed", PropertyInfo(Variant::INT, "orientation")));
ClassDB::bind_method(D_METHOD("has_feature", "feature"), &DisplayServer::has_feature);
ClassDB::bind_method(D_METHOD("get_name"), &DisplayServer::get_name);