From 654af88529a692f2d14fb288a1c0081c8b809db7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Apr 2020 14:48:39 -0400 Subject: [PATCH 1/2] Change the approach to menu section titles Put the label below the separator, and give it the title style class. --- gtk/gtkmenusectionbox.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index 7933f81dfa..413789a274 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -612,24 +612,21 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, GtkWidget *separator; GtkWidget *title; - box->separator = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); + box->separator = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_ref_sink (box->separator); - separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (box->separator), separator); - gtk_size_group_add_widget (box->indicators, separator); - - title = gtk_label_new (label); - g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE); - gtk_widget_add_css_class (title, GTK_STYLE_CLASS_SEPARATOR); - gtk_widget_set_halign (title, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (box->separator), title); - separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); gtk_widget_set_hexpand (separator, TRUE); gtk_container_add (GTK_CONTAINER (box->separator), separator); + + title = gtk_label_new (label); + g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE); + gtk_widget_add_css_class (title, GTK_STYLE_CLASS_SEPARATOR); + gtk_widget_set_halign (title, GTK_ALIGN_START); + gtk_label_set_xalign (GTK_LABEL (title), 0.0); + gtk_widget_add_css_class (title, GTK_STYLE_CLASS_TITLE); + gtk_container_add (GTK_CONTAINER (box->separator), title); } else { From 1edfd80528b632f8d845554df6cdd44eaa3a1d29 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Apr 2020 14:55:14 -0400 Subject: [PATCH 2/2] Adwaita: Some styling for menu section titles More fine-tuning needed. --- gtk/theme/Adwaita/_common.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 2538278922..c9b3178f8a 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -4450,6 +4450,11 @@ popover.menu { &:selected { @extend %selected_items; } } + + & label.title { + font-weight: bold; + padding: 4px 20px; + } } statusbar {