From: Ben Pfaff <blp@gnu.org>
Date: Tue, 9 Jun 2009 03:37:46 +0000 (-0700)
Subject: cairo: Fix header box drawing.
X-Git-Tag: v0.7.3~50
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f7a411a6ca4f8c1bfe5c07d69af3bddb11699fc;p=pspp-builds.git

cairo: Fix header box drawing.
---

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 0a2190eb..23a93287 100644
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -650,10 +650,9 @@ draw_headers (struct outp_driver *this)
   x1 = this->width - this->prop_em_width;
 
   /* Draw box. */
-  /* XXX coordinates below might not be right, both in terms of
-     the Y transformation and width/height versus x2/y2. */
-  cairo_rectangle (ext->cairo, 0, y,
-                   this->width, 2 * this->font_height + ext->line_gutter);
+  cairo_rectangle (ext->cairo, 0, y, this->width,
+                   2 * (this->font_height
+                        + ext->line_width + ext->line_gutter));
   cairo_save (ext->cairo);
   cairo_set_source_rgb (ext->cairo, 0.9, 0.9, 0.9);
   cairo_fill_preserve (ext->cairo);