diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-09-09 17:00:30 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-09-09 17:00:30 +0000 |
| commit | 99023cae99d97c6965de19ff38d2f0516153a37e (patch) | |
| tree | 241a7714296d46ef9f9dc5e9f420b23850224504 /render.c | |
| parent | Merge branch 'keymap-shift-return' into master (diff) | |
| parent | Add -W,--window-size-chars, and foot.ini:initial-window-size-chars (diff) | |
Merge branch 'window-size-in-characters' into master
Diffstat (limited to 'render.c')
| -rw-r--r-- | render.c | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -2032,13 +2032,24 @@ maybe_resize(struct terminal *term, int width, int height, bool force) width = term->unmaximized_width; height = term->unmaximized_height; } else { - width = term->conf->width; - height = term->conf->height; + switch (term->conf->size.type) { + case CONF_SIZE_PX: + width = term->conf->size.px.width; + height = term->conf->size.px.height; - if (term->window->use_csd == CSD_YES) { - /* Take CSD title bar into account */ - assert(!term->window->is_fullscreen); - height -= term->conf->csd.title_height; + if (term->window->use_csd == CSD_YES) { + /* Take CSD title bar into account */ + assert(!term->window->is_fullscreen); + height -= term->conf->csd.title_height; + } + break; + + case CONF_SIZE_CELLS: + width = 2 * term->conf->pad_x; + height = 2 * term->conf->pad_y; + width += term->conf->size.cells.width * term->cell_width; + height += term->conf->size.cells.height * term->cell_height; + break; } width *= scale; |
