aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-07-16 06:28:21 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-07-18 03:48:01 +0000
commit829353a5dad410ce9b6b1ca78f9d86beedc3a90e (patch)
tree6c70ec64609524a231ac41a30fe3ddd8662d834e
parentterm: (debug): dpi_aware is no longer an enum (diff)
term: font_dpi_changed: scale (and old_scale) are floating point
This should fix an issue where the font size wasn’t updated when moving the window between outputs whose scaling factors match when truncated.
-rw-r--r--terminal.c8
-rw-r--r--terminal.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/terminal.c b/terminal.c
index 213d8c59..e15e647e 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1298,7 +1298,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
goto err;
/* Load fonts */
- if (!term_font_dpi_changed(term, 0))
+ if (!term_font_dpi_changed(term, 0.))
goto err;
term->font_subpixel = get_font_subpixel(term);
@@ -2081,10 +2081,10 @@ term_font_size_reset(struct terminal *term)
}
bool
-term_font_dpi_changed(struct terminal *term, int old_scale)
+term_font_dpi_changed(struct terminal *term, float old_scale)
{
float dpi = get_font_dpi(term);
- xassert(term->scale > 0);
+ xassert(term->scale > 0.);
bool was_scaled_using_dpi = term->font_is_sized_by_dpi;
bool will_scale_using_dpi = term->conf->dpi_aware;
@@ -2097,7 +2097,7 @@ term_font_dpi_changed(struct terminal *term, int old_scale)
if (need_font_reload) {
LOG_DBG("DPI/scale change: DPI-awareness=%s, "
- "DPI: %.2f -> %.2f, scale: %d -> %d, "
+ "DPI: %.2f -> %.2f, scale: %.2f -> %.2f, "
"sizing font based on monitor's %s",
term->conf->dpi_aware ? "yes" : "no",
term->font_dpi, dpi, old_scale, term->scale,
diff --git a/terminal.h b/terminal.h
index 6dace7ac..60d3c3ac 100644
--- a/terminal.h
+++ b/terminal.h
@@ -739,7 +739,7 @@ bool term_paste_data_to_slave(
bool term_font_size_increase(struct terminal *term);
bool term_font_size_decrease(struct terminal *term);
bool term_font_size_reset(struct terminal *term);
-bool term_font_dpi_changed(struct terminal *term, int old_scale);
+bool term_font_dpi_changed(struct terminal *term, float old_scale);
void term_font_subpixel_changed(struct terminal *term);
int term_pt_or_px_as_pixels(