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

Update the logic to calculate the screen scale on Android 

Takes into account the ratio between the screen size and the default window dimensions.
This commit is contained in:
Fredia Huya-Kouadio 2023-01-21 22:04:44 -08:00
parent eaf306e0b1
commit da3e380240
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platform/android/display_server_android.cpp
View File

@ -212,7 +212,18 @@ float DisplayServerAndroid::screen_get_scale(int p_screen) const {
GodotIOJavaWrapper *godot_io_java = OS_Android::get_singleton()->get_godot_io_java();
ERR_FAIL_NULL_V(godot_io_java, 1.0f);
return godot_io_java->get_scaled_density();
float screen_scale = godot_io_java->get_scaled_density();
// Update the scale to avoid cropping.
Size2i screen_size = screen_get_size(p_screen);
if (screen_size != Size2i()) {
float width_scale = screen_size.width / (float)OS_Android::DEFAULT_WINDOW_WIDTH;
float height_scale = screen_size.height / (float)OS_Android::DEFAULT_WINDOW_HEIGHT;
screen_scale = MIN(screen_scale, MIN(width_scale, height_scale));
}
print_line("Selected screen scale: ", screen_scale);
return screen_scale;
}
float DisplayServerAndroid::screen_get_refresh_rate(int p_screen) const {

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

@ -150,7 +150,6 @@ public class GodotIO {
} else {
selectedScaledDensity = 0.75f;
}
Log.d(TAG, "Selected scaled density: " + selectedScaledDensity);
return selectedScaledDensity;
}

4
platform/android/os_android.cpp
View File

@ -695,8 +695,8 @@ bool OS_Android::_check_internal_feature_support(const String &p_feature) {
}
OS_Android::OS_Android(GodotJavaWrapper *p_godot_java, GodotIOJavaWrapper *p_godot_io_java, bool p_use_apk_expansion) {
display_size.width = 800;
display_size.height = 600;
display_size.width = DEFAULT_WINDOW_WIDTH;
display_size.height = DEFAULT_WINDOW_HEIGHT;
use_apk_expansion = p_use_apk_expansion;

2
platform/android/os_android.h
View File

@ -86,6 +86,8 @@ private:
public:
static const char *ANDROID_EXEC_PATH;
static const int DEFAULT_WINDOW_WIDTH = 800;
static const int DEFAULT_WINDOW_HEIGHT = 600;
virtual void initialize_core() override;
virtual void initialize() override;