toolbutton: Fix off-center icons

When the toolbar style is both-horiz, and the item
is not important, we were not centering the icon in the
same way as in gtk3. The reason is that we overlooked
the expand child property being set to TRUE in this case.
This commit is contained in:
Matthias Clasen 2018-01-07 12:42:27 -05:00
parent b89bf98731
commit 5ce2d77691

View File

@ -514,7 +514,11 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
{
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
if (icon)
gtk_box_pack_start (GTK_BOX (box), icon);
{
gtk_box_pack_start (GTK_BOX (box), icon);
if (!label)
gtk_widget_set_hexpand (icon, TRUE);
}
if (label)
gtk_box_pack_end (GTK_BOX (box), label);
}
@ -522,7 +526,11 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
{
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
if (icon)
gtk_box_pack_end (GTK_BOX (box), icon);
{
gtk_box_pack_end (GTK_BOX (box), icon);
if (!label)
gtk_widget_set_vexpand (icon, TRUE);
}
if (label)
gtk_box_pack_start (GTK_BOX (box), label);
}