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

Make GtkCheckButton allocate all remaining space to it's child instead

Browse Source 
of limiting it to it's minimum size.

This fixes height-for-width labels inside a GtkCheckButton, for some
reason GtkCheckButton was limiting the child allocation to the child's
minimum request, probably for the sake of virtual left-alignment of
the child label to be beside the checkmark. This should be done by
other means if nescesarry.
This commit is contained in:
Tristan Van Berkom 2010-12-29 16:19:48 +09:00
parent 2fe4e6a815
commit f519da41cf
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkcheckbutton.c
View File

@ -334,16 +334,11 @@ gtk_check_button_size_allocate (GtkWidget *widget,
GtkRequisition child_requisition; GtkRequisition child_requisition;
guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_widget_get_preferred_size (child, &child_requisition, NULL); child_allocation.width = allocation->width -
((border_width + focus_width + focus_pad) * 2 + indicator_size + indicator_spacing * 3);
child_allocation.width = MIN (child_requisition.width,
allocation->width -
((border_width + focus_width + focus_pad) * 2
+ indicator_size + indicator_spacing * 3));
child_allocation.width = MAX (child_allocation.width, 1); child_allocation.width = MAX (child_allocation.width, 1);
child_allocation.height = MIN (child_requisition.height, child_allocation.height = allocation->height - (border_width + focus_width + focus_pad) * 2;
allocation->height - (border_width + focus_width + focus_pad) * 2);
child_allocation.height = MAX (child_allocation.height, 1); child_allocation.height = MAX (child_allocation.height, 1);
child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 + child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 +