callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make empty buttonboxes work again

Browse Source 
There was some less than careful / nvis_children.
This commit is contained in:
Matthias Clasen
2010-08-25 00:29:27 -04:00
parent 06c2777d88
commit e1143c2d45
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkbbox.c
View File

@ -460,8 +460,8 @@ gtk_button_box_child_requisition (GtkWidget *widget,
avg_h += child_requisition.height + ipad_h; avg_h += child_requisition.height + ipad_h;
} }
} }
avg_w /= nchildren; avg_w /= MAX (nchildren, 1);
avg_h /= nchildren; avg_h /= MAX (nchildren, 1);
*widths = g_new (gint, nchildren); *widths = g_new (gint, nchildren);
*heights = g_new (gint, nchildren); *heights = g_new (gint, nchildren);
@ -484,9 +484,7 @@ gtk_button_box_child_requisition (GtkWidget *widget,
gtk_widget_get_child_requisition (child, &child_requisition); gtk_widget_get_child_requisition (child, &child_requisition);
if (homogeneous || if (homogeneous || (child_requisition.width + ipad_w < avg_w * 1.5))
(child_requisition.width + ipad_w < avg_w * 1.5)) /* &&
child_requisition.width + ipad_w > avg_w / 1.5)) */
{ {
(*widths)[i] = -1; (*widths)[i] = -1;
if (child_requisition.width + ipad_w > needed_width) if (child_requisition.width + ipad_w > needed_width)
@ -497,9 +495,7 @@ gtk_button_box_child_requisition (GtkWidget *widget,
(*widths)[i] = child_requisition.width + ipad_w; (*widths)[i] = child_requisition.width + ipad_w;
} }
if (homogeneous || if (homogeneous || (child_requisition.height + ipad_h < avg_h * 1.5))
(child_requisition.height + ipad_h < avg_h * 1.5)) /* &&
child_requisition.height + ipad_h > avg_h / 1.5)) */
{ {
(*heights)[i] = -1; (*heights)[i] = -1;
if (child_requisition.height + ipad_h > needed_height) if (child_requisition.height + ipad_h > needed_height)