aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-11-30 19:14:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-11-30 19:14:37 +0000
commitf55e65808c86d4a4c49e0777af6ecae7d3a107df (patch)
tree57d244881467b30488f384a7d5e38c839ec64830 /render.c
parentselection: offer clipboard content in more mime types (diff)
parentconfig: replace union in config struct with simple width/height members (diff)
Merge branch 'simplify-config-struct'
Diffstat (limited to 'render.c')
-rw-r--r--render.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/render.c b/render.c
index 53363071..dc926cc4 100644
--- a/render.c
+++ b/render.c
@@ -2180,8 +2180,8 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
} else {
switch (term->conf->size.type) {
case CONF_SIZE_PX:
- width = term->conf->size.px.width;
- height = term->conf->size.px.height;
+ width = term->conf->size.width;
+ height = term->conf->size.height;
if (term->window->use_csd == CSD_YES) {
/* Take CSD title bar into account */
@@ -2194,8 +2194,8 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
break;
case CONF_SIZE_CELLS:
- width = term->conf->size.cells.width * term->cell_width;
- height = term->conf->size.cells.height * term->cell_height;
+ width = term->conf->size.width * term->cell_width;
+ height = term->conf->size.height * term->cell_height;
width += 2 * term->conf->pad_x * scale;
height += 2 * term->conf->pad_y * scale;