Browse Source

Some clean up to previous commit.

Juan Linietsky 6 years ago
parent
commit
21289c6fea
2 changed files with 3 additions and 3 deletions
  1. 2 2
      editor/editor_properties.cpp
  2. 1 1
      editor/editor_themes.cpp

+ 2 - 2
editor/editor_properties.cpp

@@ -2465,14 +2465,14 @@ void EditorPropertyResource::_fold_other_editors(Object *p_self) {
 		return;
 		return;
 	bool unfolded = get_edited_object()->editor_is_section_unfolded(get_edited_property());
 	bool unfolded = get_edited_object()->editor_is_section_unfolded(get_edited_property());
 
 
+	opened_editor = false;
+
 	if (unfolded) {
 	if (unfolded) {
 		//refold
 		//refold
 		assign->set_pressed(false);
 		assign->set_pressed(false);
 		get_edited_object()->editor_set_section_unfold(get_edited_property(), false);
 		get_edited_object()->editor_set_section_unfold(get_edited_property(), false);
 		update_property();
 		update_property();
 	}
 	}
-
-	opened_editor = false;
 }
 }
 
 
 void EditorPropertyResource::update_property() {
 void EditorPropertyResource::update_property() {

+ 1 - 1
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_icon("visibility_xray", "PopupMenu", theme->get_icon("GuiVisibilityXray", "EditorIcons"));
 	theme->set_constant("vseparation", "PopupMenu", (extra_spacing + default_margin_size + 1) * EDSCALE);
 	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_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_color(MARGIN_LEFT, accent_color * Color(1, 1, 1, 0.3));
 	sub_inspector_bg->set_border_width(MARGIN_RIGHT, 2);
 	sub_inspector_bg->set_border_width(MARGIN_RIGHT, 2);