diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-15 12:14:17 +0100 |
|---|---|---|
| committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-15 12:14:17 +0100 |
| commit | 11f8b176326dbee5d817fc6a924507126511b0d7 (patch) | |
| tree | 6b72aedf153112f774fcc5c6c6a116648042e46a | |
| parent | 3796c746110e4d390586174f0a48a19756731405 (diff) | |
fix(rendering): use baseline_y1 instead of pixel_size - baseline_y0
| -rw-r--r-- | buchstabensuppe.c | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/buchstabensuppe.c b/buchstabensuppe.c index 9963379..f5f4605 100644 --- a/buchstabensuppe.c +++ b/buchstabensuppe.c @@ -280,24 +280,24 @@ bool bs_render_grapheme_append(bs_context_t *ctx, bs_bitmap_t *target, bs_cursor /* +--- cursor position * v - * +----------------+ --+ - * | | | p - * | | | i - * | | | x - * | | | e - * | | | l - * | | | _ - * | | | h - * | +----------+ --+ | e - * | | | | | | i - * | | | | | tt_offset_y | g - * | | glyph | | | | h - * tt_offset_x --------+--+ | | | | | t - * | | | | | | | - * | v | | | v | + * +-- +----------------+ --+ + * | | | | p + * | | | | i + * | | | | | x + * baseline_y1 | | | | | e + * v | | | | l + * | | | | _ + * | | | | h + * | | +----------+ --+ | e + * | | | | | | | i + * | | | | | | tt_offset_y | g + * | | | glyph | | | | h + * tt_offset_x --+-----+--+ | | | | | t + * | | | | | | | | + * | | v | | | v | * +-- +-----+ - - - - + --+ | - * baseline_y0 | | | | | | - * v | | | | | + * baseline_y0 ^ | | | | | + * | | | | | | * +-- +-----+----------+ ---+ * * This means the top right corner of the @@ -320,14 +320,25 @@ bool bs_render_grapheme_append(bs_context_t *ctx, bs_bitmap_t *target, bs_cursor * and thus “above” means “below”) */ - int baseline_y0; + int baseline_y0, baseline_y1; - stbtt_GetFontBoundingBox(font, &abyss, &baseline_y0, &abyss, &abyss); - baseline_y0 = (-1) * round(baseline_y0 * scale_y); + stbtt_GetFontBoundingBox(font, &abyss, &baseline_y0, &abyss, &baseline_y1); + baseline_y0 = round(baseline_y0 * scale_y); + baseline_y1 = round(baseline_y1 * scale_y); + + int baseline = baseline_y1; + + if(-baseline_y0 + baseline_y1 > (int) ctx->bs_fonts[font_index].bs_font_pixel_height) { + LOG("Warn: font is actually higher than pixel size"); + // possible compromise between top & bottom in this case + // which makes zero sense: + // baseline = baseline_y0 + baseline_y1; + } + + LOG("Baseline y0: %d y1: %d", baseline_y0, baseline_y1); int offset_x = glyph_pos[i].x_offset + tt_offset_x; - int offset_y = glyph_pos[i].y_offset + tt_offset_y - baseline_y0 - + ctx->bs_fonts[font_index].bs_font_pixel_height; + int offset_y = glyph_pos[i].y_offset + tt_offset_y + baseline; LOG("Computed offset: (%d, %d)", offset_x, offset_y); |