godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55210 from madmiraal/fix-android-orientation-3.x

Browse Source 
[3.x] Fix Android `get_screen_orientation()` not returning valid values
This commit is contained in:
Fredia Huya-Kouadio 2021-11-21 17:46:00 -08:00 committed by GitHub
commit 6920aa11b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,10 +285,37 @@ public class GodotIO {
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER); activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
} break; } break;
} }
}; }
public int getScreenOrientation() { public int getScreenOrientation() {
return activity.getRequestedOrientation(); int orientation = activity.getRequestedOrientation();
switch (orientation) {
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
return SCREEN_LANDSCAPE;
case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
return SCREEN_PORTRAIT;
case ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE:
return SCREEN_REVERSE_LANDSCAPE;
case ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT:
return SCREEN_REVERSE_PORTRAIT;
case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE:
case ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE:
return SCREEN_SENSOR_LANDSCAPE;
case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT:
case ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT:
return SCREEN_SENSOR_PORTRAIT;
case ActivityInfo.SCREEN_ORIENTATION_SENSOR:
case ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR:
case ActivityInfo.SCREEN_ORIENTATION_FULL_USER:
return SCREEN_SENSOR;
case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED:
case ActivityInfo.SCREEN_ORIENTATION_USER:
case ActivityInfo.SCREEN_ORIENTATION_BEHIND:
case ActivityInfo.SCREEN_ORIENTATION_NOSENSOR:
case ActivityInfo.SCREEN_ORIENTATION_LOCKED:
default:
return -1;
}
} }
public void setEdit(GodotEditText _edit) { public void setEdit(GodotEditText _edit) {

1
platform/android/os_android.cpp
View File

@ -469,6 +469,7 @@ void OS_Android::set_screen_orientation(ScreenOrientation p_orientation) {
OS::ScreenOrientation OS_Android::get_screen_orientation() const { OS::ScreenOrientation OS_Android::get_screen_orientation() const {
const int orientation = godot_io_java->get_screen_orientation(); const int orientation = godot_io_java->get_screen_orientation();
ERR_FAIL_INDEX_V_MSG(orientation, 7, OS::ScreenOrientation(0), "Unrecognized screen orientation.");
return OS::ScreenOrientation(orientation); return OS::ScreenOrientation(orientation);
} }