From 126f85535f72dbe7fccf9b1a32994727a90ffa3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 21 Mar 2012 12:37:04 -0400 Subject: [PATCH] window.c: Fix the stretch scaling code --- clients/cairo-util.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/clients/cairo-util.c b/clients/cairo-util.c index 09dd06e..b91fd1f 100644 --- a/clients/cairo-util.c +++ b/clients/cairo-util.c @@ -165,8 +165,8 @@ tile_mask(cairo_t *cr, cairo_surface_t *surface, } /* Top stretch */ - cairo_matrix_init_translate(&matrix, 64, 0); - cairo_matrix_scale(&matrix, 64.0 / width, 1); + cairo_matrix_init_translate(&matrix, 60, 0); + cairo_matrix_scale(&matrix, 8.0 / width, 1); cairo_matrix_translate(&matrix, -x - width / 2, -y); cairo_pattern_set_matrix(pattern, &matrix); cairo_rectangle(cr, x + margin, y, width - 2 * margin, margin); @@ -190,8 +190,8 @@ tile_mask(cairo_t *cr, cairo_surface_t *surface, cairo_mask(cr, pattern); /* Left stretch */ - cairo_matrix_init_translate(&matrix, 0, 64); - cairo_matrix_scale(&matrix, 1, 64.0 / height); + cairo_matrix_init_translate(&matrix, 0, 60); + cairo_matrix_scale(&matrix, 1, 8.0 / height); cairo_matrix_translate(&matrix, -x, -y - height / 2); cairo_pattern_set_matrix(pattern, &matrix); cairo_reset_clip(cr); @@ -247,8 +247,8 @@ tile_source(cairo_t *cr, cairo_surface_t *surface, } /* Top stretch */ - cairo_matrix_init_translate(&matrix, 64, 0); - cairo_matrix_scale(&matrix, 64.0 / (width - 2 * margin), 1); + cairo_matrix_init_translate(&matrix, 60, 0); + cairo_matrix_scale(&matrix, 8.0 / (width - 2 * margin), 1); cairo_matrix_translate(&matrix, -x - width / 2, -y); cairo_pattern_set_matrix(pattern, &matrix); cairo_rectangle(cr, x + margin, y, width - 2 * margin, top_margin); @@ -262,8 +262,8 @@ tile_source(cairo_t *cr, cairo_surface_t *surface, cairo_fill(cr); /* Left stretch */ - cairo_matrix_init_translate(&matrix, 0, 64); - cairo_matrix_scale(&matrix, 1, 64.0 / (height - margin - top_margin)); + cairo_matrix_init_translate(&matrix, 0, 60); + cairo_matrix_scale(&matrix, 1, 8.0 / (height - margin - top_margin)); cairo_matrix_translate(&matrix, -x, -y - height / 2); cairo_pattern_set_matrix(pattern, &matrix); cairo_rectangle(cr, x, y + top_margin, -- 2.7.4