asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust auto scale on high res displays

Browse source 
(cherry picked from commit 466cf0b466)
This commit is contained in:
Ansraer 2021-02-12 00:07:19 +01:00 committed by Rémi Verschelde
parent fc0419d84a
commit 729a9c8a5e
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_node.cpp
View file

@ -5858,6 +5858,10 @@ EditorNode::EditorNode() {
if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).y >= 1400) { if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).y >= 1400) {
// hiDPI display. // hiDPI display.
scale = 2.0; scale = 2.0;
} else if (OS::get_singleton()->get_screen_size(screen).y >= 1700) {
// Likely a hiDPI display, but we aren't certain due to the returned DPI.
// Use an intermediate scale to handle this situation.
scale = 1.5;
} else if (OS::get_singleton()->get_screen_size(screen).y <= 800) { } else if (OS::get_singleton()->get_screen_size(screen).y <= 800) {
// Small loDPI display. Use a smaller display scale so that editor elements fit more easily. // 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. // Icons won't look great, but this is better than having editor elements overflow from its window.

4
editor/editor_settings.cpp
View file

@ -328,6 +328,10 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).y >= 1400) { if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).y >= 1400) {
// hiDPI display. // hiDPI display.
scale = 2.0; scale = 2.0;
} else if (OS::get_singleton()->get_screen_size(screen).y >= 1700) {
// Likely a hiDPI display, but we aren't certain due to the returned DPI.
// Use an intermediate scale to handle this situation.
scale = 1.5;
} else if (OS::get_singleton()->get_screen_size(screen).y <= 800) { } else if (OS::get_singleton()->get_screen_size(screen).y <= 800) {
// Small loDPI display. Use a smaller display scale so that editor elements fit more easily. // 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. // Icons won't look great, but this is better than having editor elements overflow from its window.

4
editor/project_manager.cpp
View file

@ -2448,6 +2448,10 @@ ProjectManager::ProjectManager() {
if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).y >= 1400) { if (OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).y >= 1400) {
// hiDPI display. // hiDPI display.
scale = 2.0; scale = 2.0;
} else if (OS::get_singleton()->get_screen_size(screen).y >= 1700) {
// Likely a hiDPI display, but we aren't certain due to the returned DPI.
// Use an intermediate scale to handle this situation.
scale = 1.5;
} else if (OS::get_singleton()->get_screen_size(screen).y <= 800) { } else if (OS::get_singleton()->get_screen_size(screen).y <= 800) {
// Small loDPI display. Use a smaller display scale so that editor elements fit more easily. // 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. // Icons won't look great, but this is better than having editor elements overflow from its window.