From 1b3bb244b6b584fbee69e120fe3cbcdb19069ce0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 7 Jan 2016 18:38:31 -0500 Subject: [PATCH] color swatch: Fix up rendering gtk_render_content_path is expecting the full box dimensions, not just the content area. So, add the border before calling it. Note it is still possible to have some separation between the color and the border, by setting padding. --- gtk/gtkcolorswatch.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c index 4f31f6ebad..6f574940d3 100644 --- a/gtk/gtkcolorswatch.c +++ b/gtk/gtkcolorswatch.c @@ -119,8 +119,14 @@ gtk_color_swatch_render (GtkCssGadget *gadget, { cairo_pattern_t *pattern; cairo_matrix_t matrix; + GtkBorder border; - gtk_render_content_path (context, cr, x, y, width, height); + gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border); + gtk_render_content_path (context, cr, + x - border.left, + y - border.top, + width + border.left + border.right, + height + border.top + border.bottom); if (swatch->priv->use_alpha) {