From 04f43116d60c49c1f6dac2edf5140404692b62a9 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Thu, 19 Sep 2019 22:27:29 +0200 Subject: Improve folding appearance in the editor inspector The arrow is now displayed at the left to be consistent with other places where folding is used. The arrow icons used are now consistent with the rest of the editor. The `arrow_up` icon is no longer used anywhere, so it was removed. Additional spacing was also added for a better visual appearance. --- editor/editor_inspector.cpp | 15 +++++++-------- editor/editor_themes.cpp | 1 - editor/icons/icon_arrow_up.svg | 5 ----- 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 editor/icons/icon_arrow_up.svg diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index a76d34e122..8d5858a10d 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -1046,9 +1046,9 @@ void EditorInspectorSection::_notification(int p_what) { if (foldable) { if (object->editor_is_section_unfolded(section)) { - arrow = get_icon("arrow_up", "Tree"); - } else { arrow = get_icon("arrow", "Tree"); + } else { + arrow = get_icon("arrow_collapsed", "Tree"); } } @@ -1087,9 +1087,9 @@ void EditorInspectorSection::_notification(int p_what) { if (foldable) { if (object->editor_is_section_unfolded(section)) { - arrow = get_icon("arrow_up", "Tree"); - } else { arrow = get_icon("arrow", "Tree"); + } else { + arrow = get_icon("arrow_collapsed", "Tree"); } } @@ -1103,13 +1103,12 @@ void EditorInspectorSection::_notification(int p_what) { draw_rect(Rect2(Vector2(), Vector2(get_size().width, h)), bg_color); - int hs = get_constant("hseparation", "Tree"); - + const int arrow_margin = 3; Color color = get_color("font_color", "Tree"); - draw_string(font, Point2(hs, font->get_ascent() + (h - font->get_height()) / 2).floor(), label, color, get_size().width); + draw_string(font, Point2(Math::round((16 + arrow_margin) * EDSCALE), font->get_ascent() + (h - font->get_height()) / 2).floor(), label, color, get_size().width); if (arrow.is_valid()) { - draw_texture(arrow, Point2(get_size().width - arrow->get_width(), (h - arrow->get_height()) / 2).floor()); + draw_texture(arrow, Point2(Math::round(arrow_margin * EDSCALE), (h - arrow->get_height()) / 2).floor()); } } } diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index e29e44caa2..ab6158fb6c 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -685,7 +685,6 @@ Ref create_editor_theme(const Ref p_theme) { // Tree theme->set_icon("checked", "Tree", theme->get_icon("GuiChecked", "EditorIcons")); theme->set_icon("unchecked", "Tree", theme->get_icon("GuiUnchecked", "EditorIcons")); - theme->set_icon("arrow_up", "Tree", theme->get_icon("GuiTreeArrowUp", "EditorIcons")); theme->set_icon("arrow", "Tree", theme->get_icon("GuiTreeArrowDown", "EditorIcons")); theme->set_icon("arrow_collapsed", "Tree", theme->get_icon("GuiTreeArrowRight", "EditorIcons")); theme->set_icon("updown", "Tree", theme->get_icon("GuiTreeUpdown", "EditorIcons")); diff --git a/editor/icons/icon_arrow_up.svg b/editor/icons/icon_arrow_up.svg deleted file mode 100644 index 77a20e8c50..0000000000 --- a/editor/icons/icon_arrow_up.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - -- cgit v1.2.3