From 0f15f0ba43dc60d98dc17b77492ccf1089186abb Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 3 Dec 2019 21:00:48 +0100 Subject: fcft: update to 0.3.0 fcft now calculates the underline and strikeout integer positions, making our rendering code much simpler. --- render.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 5f11983a..b8d8381c 100644 --- a/render.c +++ b/render.c @@ -105,14 +105,11 @@ draw_underline(const struct terminal *term, pixman_image_t *pix, const struct font *font, const pixman_color_t *color, int x, int y, int cols) { - int baseline = y + font_baseline(term); - double width = font->underline.thickness; - int y_under = floor(baseline - font->underline.position + width / 2.); - pixman_image_fill_rectangles( PIXMAN_OP_SRC, pix, color, 1, &(pixman_rectangle16_t){ - x, y_under, cols * term->cell_width, round(max(1., width))}); + x, y + font_baseline(term) - font->underline.position, + cols * term->cell_width, font->underline.thickness}); } static void @@ -120,14 +117,11 @@ draw_strikeout(const struct terminal *term, pixman_image_t *pix, const struct font *font, const pixman_color_t *color, int x, int y, int cols) { - int baseline = y + font_baseline(term); - double width = font->strikeout.thickness; - int y_strike = floor(baseline - font->strikeout.position + width / 2.); - pixman_image_fill_rectangles( PIXMAN_OP_SRC, pix, color, 1, &(pixman_rectangle16_t){ - x, y_strike, cols * term->cell_width, round(max(1., width))}); + x, y + font_baseline(term) - font->strikeout.position, + cols * term->cell_width, font->strikeout.thickness}); } static bool -- cgit v1.3