box-drawing: x/y offsets: use pre-calculated offset values from term struct

This commit is contained in:
Daniel Eklöf 2021-01-07 17:19:43 +01:00
parent 1830dfca55
commit 25c2379d5f
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

View file

@ -2064,23 +2064,13 @@ box_drawing(const struct terminal *term, wchar_t wc)
}; };
draw_glyph(wc, &buf); draw_glyph(wc, &buf);
const struct config *conf = term->conf;
int x_ofs = conf->horizontal_letter_offset.px > 0
? conf->horizontal_letter_offset.px
: conf->horizontal_letter_offset.pt * term->font_dpi / 72.;
int y_ofs = conf->vertical_letter_offset.px > 0
? conf->vertical_letter_offset.px
: conf->vertical_letter_offset.pt * term->font_dpi / 72.;
struct fcft_glyph *glyph = xmalloc(sizeof(*glyph)); struct fcft_glyph *glyph = xmalloc(sizeof(*glyph));
*glyph = (struct fcft_glyph){ *glyph = (struct fcft_glyph){
.wc = wc, .wc = wc,
.cols = 1, .cols = 1,
.pix = pix, .pix = pix,
.x = -x_ofs, .x = -term->font_x_ofs,
.y = y_ofs + term->fonts[0]->ascent, .y = term->font_y_ofs + term->fonts[0]->ascent,
.width = width, .width = width,
.height = height, .height = height,
.advance = { .advance = {