mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-13 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

term: reload_fonts(): ‘scale’ is not a float

Browse source
This commit is contained in:
Daniel Eklöf 2023-06-22 14:39:34 +02:00
parent 2bb7b28837
commit 424d045084
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
terminal.c
View file

@ -1000,14 +1000,14 @@ reload_fonts(struct terminal *term)
bool use_px_size = term->font_sizes[i][j].px_size > 0; bool use_px_size = term->font_sizes[i][j].px_size > 0;
char size[64]; char size[64];
const int scale = term->font_is_sized_by_dpi ? 1 : term->scale; const float scale = term->font_is_sized_by_dpi ? 1. : term->scale;
if (use_px_size) if (use_px_size)
snprintf(size, sizeof(size), ":pixelsize=%d", snprintf(size, sizeof(size), ":pixelsize=%d",
term->font_sizes[i][j].px_size * scale); (int)round(term->font_sizes[i][j].px_size * scale));
else else
snprintf(size, sizeof(size), ":size=%.2f", snprintf(size, sizeof(size), ":size=%.2f",
term->font_sizes[i][j].pt_size * (double)scale); term->font_sizes[i][j].pt_size * scale);
size_t len = strlen(font->pattern) + strlen(size) + 1; size_t len = strlen(font->pattern) + strlen(size) + 1;
names[i][j] = xmalloc(len); names[i][j] = xmalloc(len);
@ -1232,7 +1232,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
.reverse_wrap = true, .reverse_wrap = true,
.auto_margin = true, .auto_margin = true,
.window_title_stack = tll_init(), .window_title_stack = tll_init(),
.scale = 1, .scale = 1.,
.flash = {.fd = flash_fd}, .flash = {.fd = flash_fd},
.blink = {.fd = -1}, .blink = {.fd = -1},
.vt = { .vt = {