diff options
| author | Rémi Verschelde | 2017-10-09 11:04:46 +0200 |
|---|---|---|
| committer | GitHub | 2017-10-09 11:04:46 +0200 |
| commit | 2e0c7bb22a7b015c6aa2cd7c2c499ea6277e0ca4 (patch) | |
| tree | 63b76a78ea4bde51661e71a21b87e187081f0294 /editor | |
| parent | 8e9b99fe59a360c0c9822e8e3e8f53afd1a72b5c (diff) | |
| parent | a7f18798aab00eecd64af7b824551444cb95f1b5 (diff) | |
| download | godot-2e0c7bb22a7b015c6aa2cd7c2c499ea6277e0ca4.tar.gz godot-2e0c7bb22a7b015c6aa2cd7c2c499ea6277e0ca4.tar.zst godot-2e0c7bb22a7b015c6aa2cd7c2c499ea6277e0ca4.zip | |
Merge pull request #11718 from poke1024/retina
Fixes some retina problems on multi monitor setups
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 3 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 4e0ad3832..ff415c83f 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4588,7 +4588,8 @@ EditorNode::EditorNode() { { int dpi_mode = EditorSettings::get_singleton()->get("interface/editor/hidpi_mode"); if (dpi_mode == 0) { - editor_set_scale(OS::get_singleton()->get_screen_dpi(0) >= 192 && OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x > 2000 ? 2.0 : 1.0); + const int screen = OS::get_singleton()->get_current_screen(); + editor_set_scale(OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).x > 2000 ? 2.0 : 1.0); } else if (dpi_mode == 1) { editor_set_scale(0.75); } else if (dpi_mode == 2) { diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 1fb3fb2ed..9f23df5c0 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -1420,7 +1420,8 @@ ProjectManager::ProjectManager() { { int dpi_mode = EditorSettings::get_singleton()->get("interface/editor/hidpi_mode"); if (dpi_mode == 0) { - editor_set_scale(OS::get_singleton()->get_screen_dpi(0) >= 192 && OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x > 2000 ? 2.0 : 1.0); + const int screen = OS::get_singleton()->get_current_screen(); + editor_set_scale(OS::get_singleton()->get_screen_dpi(screen) >= 192 && OS::get_singleton()->get_screen_size(screen).x > 2000 ? 2.0 : 1.0); } else if (dpi_mode == 1) { editor_set_scale(0.75); } else if (dpi_mode == 2) { |