diff options
author | Juan Linietsky <juan@godotengine.org> | 2019-03-04 17:11:49 -0300 |
---|---|---|
committer | Juan Linietsky <juan@godotengine.org> | 2019-03-04 17:11:49 -0300 |
commit | 21289c6fea03af5ba84ab013efac3fd05547919a (patch) | |
tree | 26f17f6d00d96d44836f6b46049258d34ed01e5e | |
parent | 472c94ce3e6cfe210f2687cadc19d64ad5f4c8f1 (diff) |
Some clean up to previous commit.
-rw-r--r-- | editor/editor_properties.cpp | 4 | ||||
-rw-r--r-- | editor/editor_themes.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 7068ff3d76..16a4654123 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2465,14 +2465,14 @@ void EditorPropertyResource::_fold_other_editors(Object *p_self) { return; bool unfolded = get_edited_object()->editor_is_section_unfolded(get_edited_property()); + opened_editor = false; + if (unfolded) { //refold assign->set_pressed(false); get_edited_object()->editor_set_section_unfold(get_edited_property(), false); update_property(); } - - opened_editor = false; } void EditorPropertyResource::update_property() { diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index c9bdd8d1c4..bc42a3f23b 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -641,7 +641,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_icon("visibility_xray", "PopupMenu", theme->get_icon("GuiVisibilityXray", "EditorIcons")); theme->set_constant("vseparation", "PopupMenu", (extra_spacing + default_margin_size + 1) * EDSCALE); - Ref<StyleBoxFlat> sub_inspector_bg = make_flat_stylebox(dark_color_1, 2, 0, 2, 2); + Ref<StyleBoxFlat> sub_inspector_bg = make_flat_stylebox(dark_color_1.linear_interpolate(accent_color, 0.08), 2, 0, 2, 2); sub_inspector_bg->set_border_width(MARGIN_LEFT, 2); sub_inspector_bg->set_border_color(MARGIN_LEFT, accent_color * Color(1, 1, 1, 0.3)); sub_inspector_bg->set_border_width(MARGIN_RIGHT, 2); |