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

HiDPI: Use global/hidpi_mode as property

This commit is contained in:
Rémi Verschelde 2016-06-06 07:37:58 +02:00
parent 63ab89d28c
commit 955ed0a95f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/editor/editor_node.cpp
View File

@ -5257,7 +5257,7 @@ EditorNode::EditorNode() {
if (!EditorSettings::get_singleton()) if (!EditorSettings::get_singleton())
EditorSettings::create(); 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)); print_line("DPI MODE: "+itos(dpi_mode));
if (dpi_mode==0) { if (dpi_mode==0) {
editor_set_hidpi( OS::get_singleton()->get_screen_dpi(0) > 150 ); editor_set_hidpi( OS::get_singleton()->get_screen_dpi(0) > 150 );

4
tools/editor/editor_settings.cpp
View File

@ -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); 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); set("global/hidpi_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); 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/show_script_in_scene_tabs",false);
set("global/font_size",14); 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); hints["global/font_size"]=PropertyInfo(Variant::INT,"global/font_size",PROPERTY_HINT_RANGE,"10,40,1",PROPERTY_USAGE_DEFAULT|PROPERTY_USAGE_RESTART_IF_CHANGED);

2
tools/editor/project_manager.cpp
View File

@ -831,7 +831,7 @@ ProjectManager::ProjectManager() {
EditorSettings::create(); 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) { if (dpi_mode==0) {
editor_set_hidpi( OS::get_singleton()->get_screen_dpi(0) > 150 ); editor_set_hidpi( OS::get_singleton()->get_screen_dpi(0) > 150 );
} else if (dpi_mode==2) { } else if (dpi_mode==2) {