From 5c683d2c089e4b30b35d0f5b9c816e1a88ae6e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Thu, 22 Jul 2021 23:26:07 +0200
Subject: [PATCH] =?UTF-8?q?render:=20render=5Fosd():=20don=E2=80=99t=20ass?=
 =?UTF-8?q?ume=20a=20monospace=20font?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 render.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/render.c b/render.c
index 8fb810b9..581d0cbb 100644
--- a/render.c
+++ b/render.c
@@ -1597,11 +1597,6 @@ render_osd(struct terminal *term,
     pixman_color_t fg = color_hex_to_pixman(_fg);
     const int x_ofs = term->font_x_ofs;
 
-    const int advance =
-        (font->space_advance.x > 0
-         ? font->space_advance.x
-         : font->max_advance.x)
-        + term_pt_or_px_as_pixels(term, &term->conf->letter_spacing);
 
     for (size_t i = 0; i < wcslen(text); i++) {
         const struct fcft_glyph *glyph = fcft_glyph_rasterize(
@@ -1617,7 +1612,7 @@ render_osd(struct terminal *term,
             glyph->width, glyph->height);
         pixman_image_unref(src);
 
-        x += advance;
+        x += glyph->advance.x;
     }
 
     pixman_image_set_clip_region32(buf->pix[0], NULL);