[gtk+] gadget: Warn if clip is not set
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gadget: Warn if clip is not set
- Date: Wed, 16 Dec 2015 22:28:13 +0000 (UTC)
commit ec5596ce20a7979923d82b432d688578bb311f28
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 16 17:27:14 2015 -0500
gadget: Warn if clip is not set
This leads to hard-to-track-down drawing errors, so better
warn explicitly about it.
gtk/gtkcssgadget.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkcssgadget.c b/gtk/gtkcssgadget.c
index 8958557..a1e381e 100644
--- a/gtk/gtkcssgadget.c
+++ b/gtk/gtkcssgadget.c
@@ -524,7 +524,8 @@ gtk_css_gadget_allocate (GtkCssGadget *gadget,
GtkAllocation *out_clip)
{
GtkCssGadgetPrivate *priv = gtk_css_gadget_get_instance_private (gadget);
- GtkAllocation content_allocation, content_clip;
+ GtkAllocation content_allocation;
+ GtkAllocation content_clip = { 0, 0, 0, 0 };
GtkBorder margin, border, padding, shadow, extents;
GtkCssStyle *style;
@@ -563,11 +564,16 @@ gtk_css_gadget_allocate (GtkCssGadget *gadget,
GTK_CSS_GADGET_GET_CLASS (gadget)->allocate (gadget, &content_allocation, baseline, &content_clip);
+ if (content_clip.width == 0 || content_clip.height == 0)
+ g_warning ("GtkCssAllocateFunc did not set clip\n");
+
_gtk_css_shadows_value_get_extents (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_BOX_SHADOW), &shadow);
+
out_clip->x = allocation->x + margin.left - shadow.left;
out_clip->y = allocation->y + margin.top - shadow.top;
out_clip->width = allocation->width - margin.left - margin.right + shadow.left + shadow.right;
out_clip->height = allocation->height - margin.top - margin.bottom + shadow.top + shadow.bottom;
+
gdk_rectangle_union (&content_clip, out_clip, out_clip);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]