Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.x] Fix Android get_screen_orientation() not returning valid values #55210

Merged
merged 1 commit into from
Nov 22, 2021
Merged

[3.x] Fix Android get_screen_orientation() not returning valid values #55210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions platform/android/java/lib/src/org/godotengine/godot/GodotIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,37 @@ public void setScreenOrientation(int p_orientation) {
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
} break;
}
};
}

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) {
Expand Down
1 change: 1 addition & 0 deletions platform/android/os_android.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ void OS_Android::set_screen_orientation(ScreenOrientation p_orientation) {

OS::ScreenOrientation OS_Android::get_screen_orientation() const {
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);
}

Expand Down