summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/editor/editor_node.cpp2
-rw-r--r--tools/editor/editor_settings.cpp4
-rw-r--r--tools/editor/icons/2x/icon_control_align_bottom_left.pngbin220 -> 220 bytes
-rw-r--r--tools/editor/icons/2x/icon_control_align_bottom_right.pngbin220 -> 220 bytes
-rw-r--r--tools/editor/icons/icon_control_align_bottom_left.pngbin196 -> 194 bytes
-rw-r--r--tools/editor/icons/icon_control_align_bottom_right.pngbin194 -> 196 bytes
-rw-r--r--tools/editor/icons/source/icon_control_align_bottom_left.svg2
-rw-r--r--tools/editor/icons/source/icon_control_align_bottom_right.svg2
-rw-r--r--tools/editor/project_manager.cpp2
9 files changed, 6 insertions, 6 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/icons/2x/icon_control_align_bottom_left.png b/tools/editor/icons/2x/icon_control_align_bottom_left.png
index 56ace004a7..03520ca327 100644
--- a/tools/editor/icons/2x/icon_control_align_bottom_left.png
+++ b/tools/editor/icons/2x/icon_control_align_bottom_left.png
Binary files differ
diff --git a/tools/editor/icons/2x/icon_control_align_bottom_right.png b/tools/editor/icons/2x/icon_control_align_bottom_right.png
index 03520ca327..56ace004a7 100644
--- a/tools/editor/icons/2x/icon_control_align_bottom_right.png
+++ b/tools/editor/icons/2x/icon_control_align_bottom_right.png
Binary files differ
diff --git a/tools/editor/icons/icon_control_align_bottom_left.png b/tools/editor/icons/icon_control_align_bottom_left.png
index e098493415..d0b4bed896 100644
--- a/tools/editor/icons/icon_control_align_bottom_left.png
+++ b/tools/editor/icons/icon_control_align_bottom_left.png
Binary files differ
diff --git a/tools/editor/icons/icon_control_align_bottom_right.png b/tools/editor/icons/icon_control_align_bottom_right.png
index d0b4bed896..e098493415 100644
--- a/tools/editor/icons/icon_control_align_bottom_right.png
+++ b/tools/editor/icons/icon_control_align_bottom_right.png
Binary files differ
diff --git a/tools/editor/icons/source/icon_control_align_bottom_left.svg b/tools/editor/icons/source/icon_control_align_bottom_left.svg
index a4ba9a552a..e718208f37 100644
--- a/tools/editor/icons/source/icon_control_align_bottom_left.svg
+++ b/tools/editor/icons/source/icon_control_align_bottom_left.svg
@@ -88,7 +88,7 @@
id="rect4171"
width="4"
height="4.0000172"
- x="10"
+ x="2"
y="1046.3622" />
</g>
</svg>
diff --git a/tools/editor/icons/source/icon_control_align_bottom_right.svg b/tools/editor/icons/source/icon_control_align_bottom_right.svg
index 7a234b10ad..e4c5d884eb 100644
--- a/tools/editor/icons/source/icon_control_align_bottom_right.svg
+++ b/tools/editor/icons/source/icon_control_align_bottom_right.svg
@@ -88,7 +88,7 @@
id="rect4171"
width="4"
height="4.0000172"
- x="2"
+ x="10"
y="1046.3622" />
</g>
</svg>
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) {