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

Merge pull request #43479 from Calinou/use-low-editor-scale-auto

Browse Source 
Use 75% editor scale on small displays automatically
This commit is contained in:
Rémi Verschelde
2020-11-16 16:36:10 +01:00
committed by GitHub
parent efe3eaf6a4 c1a65e5289
commit d191ffe647
3 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/project_manager.cpp
View File

@@ -2366,12 +2366,24 @@ ProjectManager::ProjectManager() {
switch (display_scale) {
case 0: {
// Try applying a suitable display scale automatically
// Try applying a suitable display scale automatically.
#ifdef OSX_ENABLED
editor_set_scale(DisplayServer::get_singleton()->screen_get_max_scale());
#else
const int screen = DisplayServer::get_singleton()->window_get_current_screen();
editor_set_scale(DisplayServer::get_singleton()->screen_get_dpi(screen) >= 192 && DisplayServer::get_singleton()->screen_get_size(screen).x > 2000 ? 2.0 : 1.0);
float scale;
if (DisplayServer::get_singleton()->screen_get_dpi(screen) >= 192 && DisplayServer::get_singleton()->screen_get_size(screen).y >= 1400) {
// hiDPI display.
scale = 2.0;
} else if (DisplayServer::get_singleton()->screen_get_size(screen).y <= 800) {
// Small loDPI display. Use a smaller display scale so that editor elements fit more easily.
// Icons won't look great, but this is better than having editor elements overflow from its window.
scale = 0.75;
} else {
scale = 1.0;
}
editor_set_scale(scale);
#endif
} break;
@@ -2393,9 +2405,9 @@ ProjectManager::ProjectManager() {
case 6:
editor_set_scale(2.0);
break;
default: {
default:
editor_set_scale(EditorSettings::get_singleton()->get("interface/editor/custom_display_scale"));
} break;
break;
}
// Define a minimum window size to prevent UI elements from overlapping or being cut off