AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed _gtk_size_group_bump_requisition() to properly handle values specified by gtk_widget_set_size_request()

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-04-18 20:45:42 -04:00
parent e997ac37a7
commit 4c1fa76520
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkextendedlayout.c
View File

@ -230,6 +230,8 @@ compute_size_for_orientation (GtkExtendedLayout *layout,
/* Get size groups to compute the base requisition once one of the values have been cached,
* then go ahead and update the cache with the sizegroup computed value.
*
* Note this is also where values from gtk_widget_set_size_request() are considered.
*/
group_size =
_gtk_size_group_bump_requisition (GTK_WIDGET (layout),

24
gtk/gtksizegroup.c
View File

@ -750,13 +750,31 @@ _gtk_size_group_bump_requisition (GtkWidget *widget,
{
gint result = widget_requisition;
if (!is_bumping (widget) && get_size_groups (widget))
if (!is_bumping (widget))
{
GtkWidgetAuxInfo *aux_info =
_gtk_widget_get_aux_info (widget, FALSE);
/* Avoid recursion here */
mark_bumping (widget, TRUE);
result = compute_dimension (widget, mode, widget_requisition);
if (get_size_groups (widget))
{
if (aux_info)
{
if (mode == GTK_SIZE_GROUP_HORIZONTAL)
result = compute_dimension (widget, mode, MAX (aux_info->width, widget_requisition));
else
result = compute_dimension (widget, mode, MAX (aux_info->height, widget_requisition));
}
}
else if (aux_info)
{
if (mode == GTK_SIZE_GROUP_HORIZONTAL)
result = MAX (aux_info->width, widget_requisition);
else
result = MAX (aux_info->height, widget_requisition);
}
mark_bumping (widget, FALSE);
}
return result;