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

render: best-effort attempt to set initial window size in chars when scale != 1

Browse source 
The initial window size is set *before* we’re initially mapped. This
means we don’t (yet) know on which output we’ll be mapped. _That_
means we don’t know which scaling factor to use.

This implements a best effort attempt, where we use the “guessed”
scaling factor. This will always be correct in single-monitor
configurations, but may be wrong in multi-monitor setups with
different scaling factors.
This commit is contained in:
Daniel Eklöf 2020-09-14 17:34:04 +02:00
parent 51a7e44fa2
commit fdfdbba9a0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/foot.ini.5.scd
View file

@ -48,7 +48,14 @@ in this order:
*initial-window-size-chars* *initial-window-size-chars*
Initial window width and height in _characters_, on the form Initial window width and height in _characters_, on the form
_WIDTHxHEIGHT_. Mutually exclusive to _WIDTHxHEIGHT_. Mutually exclusive to
*initial-window-size-pixels*. Default: _not set_. *initial-window-size-pixels*.'
Note that if you have a multi-monitor setup, with different
scaling factors, there is a possibility the window size will not
be set correctly. If that is the case, use
*initial-window-size-pixels* instead.
Default: _not set_.
*initial-window-mode* *initial-window-mode*
Initial window mode for each newly spawned window: *windowed*, Initial window mode for each newly spawned window: *windowed*,

13
render.c
View file

@ -2023,7 +2023,7 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
if (scale == -1) { if (scale == -1) {
/* Haven't 'entered' an output yet? */ /* Haven't 'entered' an output yet? */
scale = 1; scale = term->scale;
} }
width *= scale; width *= scale;
@ -2050,18 +2050,19 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
assert(!term->window->is_fullscreen); assert(!term->window->is_fullscreen);
height -= term->conf->csd.title_height; height -= term->conf->csd.title_height;
} }
width *= scale;
height *= scale;
break; break;
case CONF_SIZE_CELLS: case CONF_SIZE_CELLS:
width = 2 * term->conf->pad_x; width = 2 * term->conf->pad_x * scale;
height = 2 * term->conf->pad_y; height = 2 * term->conf->pad_y * scale;
width += term->conf->size.cells.width * term->cell_width; width += term->conf->size.cells.width * term->cell_width;
height += term->conf->size.cells.height * term->cell_height; height += term->conf->size.cells.height * term->cell_height;
break; break;
} }
width *= scale;
height *= scale;
} }
} }