Merge branch 'matthiasc/for-master' into 'master'

menusectionbox: Improve circular button spacing

Closes #2626

See merge request GNOME/gtk!1743
This commit is contained in:
Matthias Clasen 2020-04-23 04:02:12 +00:00
commit 861bff44a8
2 changed files with 21 additions and 1 deletions

View File

@ -393,6 +393,26 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
gtk_box_reorder_child_after (GTK_BOX (box->item_box), widget, sibling);
}
if (box->circular)
{
GtkWidget *c1, *c2, *c3;
/* special-case the n > 2 case */
c1 = gtk_widget_get_first_child (GTK_WIDGET (box->item_box));
if ((c2 = gtk_widget_get_next_sibling (c1)) != NULL &&
(c3 = gtk_widget_get_next_sibling (c2)) != NULL)
{
gtk_widget_set_halign (c1, GTK_ALIGN_START);
while (c3 != NULL)
{
gtk_widget_set_halign (c2, GTK_ALIGN_CENTER);
c2 = c3;
c3 = gtk_widget_get_next_sibling (c3);
}
gtk_widget_set_halign (c2, GTK_ALIGN_END);
}
}
gtk_menu_section_box_schedule_separator_sync (box);
}

View File

@ -4390,7 +4390,7 @@ popover.menu {
}
& box.circular-buttons {
padding: 6px 0;
padding: 6px 20px;
button.circular.image-button.model {
@extend %list_button;