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

buttonbox: Don't use the parent gadget

Browse Source
This commit is contained in:
Timm Bäder 2017-05-04 21:42:05 +02:00 committed by Matthias Clasen
parent bafa55349f
commit b749de8b8f
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkbbox.c
View File

@ -775,36 +775,37 @@ gtk_button_box_measure_ (GtkWidget *widget,
int *natural_baseline) int *natural_baseline)
{ {
GtkButtonBoxPrivate *priv = gtk_button_box_get_instance_private (GTK_BUTTON_BOX (widget)); GtkButtonBoxPrivate *priv = gtk_button_box_get_instance_private (GTK_BUTTON_BOX (widget));
GtkCssGadget *gadget;
if (priv->layout_style == GTK_BUTTONBOX_EXPAND) if (priv->layout_style == GTK_BUTTONBOX_EXPAND)
gadget = gtk_box_get_gadget (GTK_BOX (widget)); {
GTK_WIDGET_CLASS (gtk_button_box_parent_class)->measure (widget, orientation, for_size,
minimum, natural,
minimum_baseline, natural_baseline);
}
else else
gadget = priv->gadget; {
gtk_css_gadget_get_preferred_size (priv->gadget,
gtk_css_gadget_get_preferred_size (gadget,
orientation, orientation,
for_size, for_size,
minimum, natural, minimum, natural,
minimum_baseline, natural_baseline); minimum_baseline, natural_baseline);
} }
}
static void static void
gtk_button_box_size_allocate (GtkWidget *widget, gtk_button_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GtkButtonBoxPrivate *priv = GTK_BUTTON_BOX (widget)->priv; GtkButtonBoxPrivate *priv = GTK_BUTTON_BOX (widget)->priv;
GtkCssGadget *gadget;
GdkRectangle clip;
if (priv->layout_style == GTK_BUTTONBOX_EXPAND) if (priv->layout_style == GTK_BUTTONBOX_EXPAND)
gadget = gtk_box_get_gadget (GTK_BOX (widget)); {
GTK_WIDGET_CLASS (gtk_button_box_parent_class)->size_allocate (widget, allocation);
}
else else
gadget = priv->gadget; {
GdkRectangle clip;
gtk_widget_set_allocation (widget, allocation); gtk_css_gadget_allocate (priv->gadget,
gtk_css_gadget_allocate (gadget,
allocation, allocation,
gtk_widget_get_allocated_baseline (widget), gtk_widget_get_allocated_baseline (widget),
&clip); &clip);
@ -812,6 +813,8 @@ gtk_button_box_size_allocate (GtkWidget *widget,
gtk_widget_set_clip (widget, &clip); gtk_widget_set_clip (widget, &clip);
} }
}
static void static void
gtk_button_box_allocate (GtkCssGadget *gadget, gtk_button_box_allocate (GtkCssGadget *gadget,
const GtkAllocation *allocation, const GtkAllocation *allocation,