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

gadget: Be more forgiving to size inconsistencies

Browse Source 
Instead of asserting if we hit negative content sizes,
warn and continue. This is easier to work with in this
transition period.
This commit is contained in:
Matthias Clasen 2015-12-04 07:52:18 -05:00
parent a52c3a3db9
commit 782c2762bf
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkcssgadget.c
View File

@ -451,8 +451,17 @@ gtk_css_gadget_allocate (GtkCssGadget *gadget,
if (baseline >= 0)
baseline += extents.top;
g_assert (content_allocation.width >= 0);
g_assert (content_allocation.height >= 0);
if (content_allocation.width < 0)
{
g_warning ("Negative content width while allocating gadget\n");
content_allocation.width = 0;
}
if (content_allocation.height < 0)
{
g_warning ("Negative content height while allocating gadget\n");
content_allocation.width = 0;
}
GTK_CSS_GADGET_GET_CLASS (gadget)->allocate (gadget, &content_allocation, baseline, &content_clip);