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

gadget: Warn about missing size allocation

Browse Source 
When size_allocate is overridden in widgets, but draw is not,
we can end up drawing a gadget that has not been given a size.

Warn about this, and limp along by drawing the gadget over the
full allocation of its owner widget.

https://bugzilla.gnome.org/show_bug.cgi?id=762614
This commit is contained in:
Matthias Clasen 2016-02-24 22:18:13 -05:00
parent c75a833633
commit dde33623ca
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkcssgadget.c
View File

@ -284,7 +284,11 @@ gtk_css_gadget_class_init (GtkCssGadgetClass *klass)
static void static void
gtk_css_gadget_init (GtkCssGadget *gadget) gtk_css_gadget_init (GtkCssGadget *gadget)
{ {
GtkCssGadgetPrivate *priv = gtk_css_gadget_get_instance_private (gadget);
priv->allocated_size.width = -1;
priv->allocated_size.height = -1;
priv->allocated_baseline = -1;
} }
/** /**
@ -729,6 +733,16 @@ gtk_css_gadget_draw (GtkCssGadget *gadget,
width = priv->allocated_size.width; width = priv->allocated_size.width;
height = priv->allocated_size.height; height = priv->allocated_size.height;
if (width < 0 || height < 0)
{
g_warning ("Drawing a gadget with negative dimensions. "
"Did you forget to allocate a size?");
x = 0;
y = 0;
width = gtk_widget_get_allocated_width (priv->owner);
height = gtk_widget_get_allocated_height (priv->owner);
}
style = gtk_css_gadget_get_style (gadget); style = gtk_css_gadget_get_style (gadget);
get_box_margin (style, &margin); get_box_margin (style, &margin);
get_box_border (style, &border); get_box_border (style, &border);