aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-29 18:39:22 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-29 18:39:22 +0000
commit013cf61ffbd58f5f706ae6688aea56a14fce6622 (patch)
treefc7eb8b9b9b7bcfdb82fb492db5c9c4fa8653dca
parentsearch: turn info log to a debug log (diff)
render: add font_baseline() - calculates the y-coordinate for the baseline
The old baseline calculation was copy-pasted to a couple of places, and also assumed that the font's height was equal to ascent+descent. While this is typically true, it isn't necessarily so. Now, we assume that height >= ascent+descent, and then position the baseline in "center" (but adjusted for the descent).
-rw-r--r--render.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/render.c b/render.c
index 566db615..88d747b6 100644
--- a/render.c
+++ b/render.c
@@ -80,6 +80,25 @@ pixman_color_dim_for_search(pixman_color_t *color)
color->blue /= 3;
}
+static inline int
+font_baseline(const struct terminal *term)
+{
+ assert(term->fextents.ascent >= 0);
+ assert(term->fextents.descent >= 0);
+
+ int diff = term->fextents.height - (term->fextents.ascent + term->fextents.descent);
+ assert(diff >= 0);
+
+#if 0
+ LOG_INFO("height=%d, ascent=%d, descent=%d, diff=%d",
+ term->fextents.height,
+ term->fextents.ascent, term->fextents.descent,
+ diff);
+#endif
+
+ return term->fextents.height - diff / 2 - term->fextents.descent;
+}
+
static void
draw_bar(const struct terminal *term, pixman_image_t *pix,
const pixman_color_t *color, int x, int y)