diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-06-06 07:37:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-06-06 07:38:39 +0200 |
| commit | 955ed0a95f61e14e6c941540b11905a16fb40d00 (patch) | |
| tree | 6d8769af36a84ef530eb96087907a923aee78b30 /tools | |
| parent | 63ab89d28cba3256eb9cdb707832e0551621acdb (diff) | |
HiDPI: Use global/hidpi_mode as property
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/editor_settings.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/project_manager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 4d92ffcc50..16614b5d2d 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -5257,7 +5257,7 @@ EditorNode::EditorNode() { if (!EditorSettings::get_singleton()) EditorSettings::create(); { - int dpi_mode = EditorSettings::get_singleton()->get("global/hdpi_mode"); + int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode"); print_line("DPI MODE: "+itos(dpi_mode)); if (dpi_mode==0) { editor_set_hidpi( OS::get_singleton()->get_screen_dpi(0) > 150 ); diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 8b1b73d5d7..bf01e02330 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -493,8 +493,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { hints["global/editor_language"]=PropertyInfo(Variant::STRING,"global/editor_language",PROPERTY_HINT_ENUM,lang_hint,PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_RESTART_IF_CHANGED); } - set("global/hdpi_mode",0); - hints["global/hdpi_mode"]=PropertyInfo(Variant::INT,"global/hdpi_mode",PROPERTY_HINT_ENUM,"Auto,LoDPI,HiDPI",PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_RESTART_IF_CHANGED); + set("global/hidpi_mode",0); + hints["global/hidpi_mode"]=PropertyInfo(Variant::INT,"global/hidpi_mode",PROPERTY_HINT_ENUM,"Auto,LoDPI,HiDPI",PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_RESTART_IF_CHANGED); set("global/show_script_in_scene_tabs",false); set("global/font_size",14); hints["global/font_size"]=PropertyInfo(Variant::INT,"global/font_size",PROPERTY_HINT_RANGE,"10,40,1",PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_RESTART_IF_CHANGED); diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index ca5e1ab0f3..84d6a87688 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -831,7 +831,7 @@ ProjectManager::ProjectManager() { EditorSettings::create(); { - int dpi_mode = EditorSettings::get_singleton()->get("global/hdpi_mode"); + int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode"); if (dpi_mode==0) { editor_set_hidpi( OS::get_singleton()->get_screen_dpi(0) > 150 ); } else if (dpi_mode==2) { |