Modern Style: Use a StyleBox in signals and groups

Author: DeeJayLSP

editor/docks/groups_editor.cpp

@@ -201,6 +201,8 @@ void GroupsEditor::_update_tree() {
 	TreeItem *root = tree->create_item();
 
 	TreeItem *local_root = tree->create_item(root);
+	local_root->set_cell_mode(0, TreeItem::CELL_MODE_CUSTOM);
+	local_root->set_custom_draw_callback(0, callable_mp(this, &GroupsEditor::_highlight_subsection_root));
 	local_root->set_text(0, TTR("Scene Groups"));
 	local_root->set_icon(0, get_editor_theme_icon(SNAME("PackedScene")));
 	local_root->set_custom_bg_color(0, get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor)));
@@ -238,6 +240,8 @@ void GroupsEditor::_update_tree() {
 	keys.sort_custom<NoCaseComparator>();
 
 	TreeItem *global_root = tree->create_item(root);
+	global_root->set_cell_mode(0, TreeItem::CELL_MODE_CUSTOM);
+	global_root->set_custom_draw_callback(0, callable_mp(this, &GroupsEditor::_highlight_subsection_root));
 	global_root->set_text(0, TTR("Global Groups"));
 	global_root->set_icon(0, get_editor_theme_icon(SNAME("Environment")));
 	global_root->set_custom_bg_color(0, get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor)));
@@ -831,6 +835,14 @@ void GroupsEditor::_node_removed(Node *p_node) {
 	}
 }
 
+void GroupsEditor::_highlight_subsection_root(Object *p_item, const Rect2 p_rect) {
+	TreeItem *item = Object::cast_to<TreeItem>(p_item);
+	ERR_FAIL_NULL(item);
+
+	const Ref<StyleBox> &stylebox = get_theme_stylebox(SNAME("style_highlight_subsection"), EditorStringName(Editor));
+	stylebox->draw(tree->get_canvas_item(), p_rect);
+}
+
 GroupsEditor::GroupsEditor() {
 	node = nullptr;
 	scene_tree = SceneTree::get_singleton();

editor/docks/groups_editor.h

@@ -122,6 +122,8 @@ class GroupsEditor : public VBoxContainer {
 
 	void _node_removed(Node *p_node);
 
+	void _highlight_subsection_root(Object *p_item, const Rect2 p_rect);
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();

editor/scene/connections_dialog.cpp

@@ -1474,6 +1474,14 @@ void ConnectionsDock::_close() {
 	hide();
 }
 
+void ConnectionsDock::_highlight_subsection_class(Object *p_item, const Rect2 p_rect) {
+	TreeItem *item = Object::cast_to<TreeItem>(p_item);
+	ERR_FAIL_NULL(item);
+
+	const Ref<StyleBox> &stylebox = get_theme_stylebox(SNAME("style_highlight_subsection"), EditorStringName(Editor));
+	stylebox->draw(tree->get_canvas_item(), p_rect);
+}
+
 void ConnectionsDock::_connect_pressed() {
 	TreeItem *item = tree->get_selected();
 	if (!item) {
@@ -1620,6 +1628,8 @@ void ConnectionsDock::update_tree() {
 			class_signals.sort();
 
 			section_item = tree->create_item(root);
+			section_item->set_cell_mode(0, TreeItem::CELL_MODE_CUSTOM);
+			section_item->set_custom_draw_callback(0, callable_mp(this, &ConnectionsDock::_highlight_subsection_class));
 			section_item->set_text(0, class_name);
 			// `|` separators used in `EditorHelpBit`.
 			section_item->set_tooltip_text(0, "class|" + doc_class_name + "|");

editor/scene/connections_dialog.h

@@ -270,6 +270,8 @@ class ConnectionsDock : public VBoxContainer {
 	void _tree_gui_input(const Ref<InputEvent> &p_event);
 	void _close();
 
+	void _highlight_subsection_class(Object *p_item, const Rect2 p_rect);
+
 protected:
 	void _connect_pressed();
 	void _notification(int p_what);

editor/themes/theme_classic.cpp

@@ -1963,11 +1963,8 @@ void ThemeClassic::populate_editor_styles(const Ref<EditorTheme> &p_theme, Edito
 		p_theme->set_constant("indent_size", "EditorInspectorSection", 6.0 * EDSCALE);
 		p_theme->set_constant("h_separation", "EditorInspectorSection", 2.0 * EDSCALE);
 
-		Color prop_subsection_stylebox_color = Color(1, 1, 1, 0);
-		p_theme->set_color("prop_subsection_stylebox", EditorStringName(Editor), prop_subsection_stylebox_color);
-
 		Ref<StyleBoxFlat> style_highlight_subsection = p_config.base_style->duplicate();
-		style_highlight_subsection->set_bg_color(prop_subsection_stylebox_color);
+		style_highlight_subsection->set_bg_color(Color(1, 1, 1, 0));
 		p_theme->set_stylebox("style_highlight_subsection", EditorStringName(Editor), style_highlight_subsection);
 
 		Color prop_category_color = p_config.dark_color_1.lerp(p_config.mono_color, 0.12);

editor/themes/theme_modern.cpp

@@ -1923,11 +1923,8 @@ void ThemeModern::populate_editor_styles(const Ref<EditorTheme> &p_theme, Editor
 		p_theme->set_constant("indent_size", "EditorInspectorSection", 6.0 * EDSCALE);
 		p_theme->set_constant("h_separation", "EditorInspectorSection", p_config.base_margin * EDSCALE);
 
-		Color prop_subsection_stylebox_color = p_config.dark_color_1.lerp(p_config.mono_color_font, p_config.dark_icon_and_font ? 0.09 : 0.16);
-		p_theme->set_color("prop_subsection_stylebox", EditorStringName(Editor), prop_subsection_stylebox_color);
-
 		Ref<StyleBoxFlat> style_highlight_subsection = p_config.base_style->duplicate();
-		style_highlight_subsection->set_bg_color(prop_subsection_stylebox_color);
+		style_highlight_subsection->set_bg_color(p_config.button_disabled_color);
 		style_highlight_subsection->set_corner_radius_all(p_config.corner_radius * EDSCALE);
 		p_theme->set_stylebox("style_highlight_subsection", EditorStringName(Editor), style_highlight_subsection);