aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-02-07 15:22:33 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-02-07 15:22:33 +0000
commitbc8c2e01124eea4911df9750583bac11160d4d2c (patch)
treeb19baade21af90da71921b63d3fab3a7688fddd5
parentinput: remove debug logging (diff)
wayland: regression: use correct scaling factor when calling render_resize()
When an output property (such as scaling factor) has changed, we need to call render_resize() to ensure the window surface is correct (for example, we may have to change its scale). The width/height parameters are in *logical* pixels (i.e. already scaled). For render_resize() to work correctly when the scale is being changed, it needs to be called with *current* logical size. This means we need to scale our current width/height using the *old* scaling factor.
-rw-r--r--wayland.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/wayland.c b/wayland.c
index d3d892df..c5feb6a1 100644
--- a/wayland.c
+++ b/wayland.c
@@ -392,6 +392,8 @@ static void
update_term_for_output_change(struct terminal *term)
{
const float old_scale = term->scale;
+ const float logical_width = term->width / old_scale;
+ const float logical_height = term->height / old_scale;
/* Note: order matters! term_update_scale() must come first */
bool scale_updated = term_update_scale(term);
@@ -400,7 +402,7 @@ update_term_for_output_change(struct terminal *term)
csd_reload_font(term->window, old_scale);
- uint8_t resize_opts = RESIZE_KEEP_GRID;
+ enum resize_options resize_opts = RESIZE_KEEP_GRID;
if (fonts_updated) {
/*
@@ -428,8 +430,8 @@ update_term_for_output_change(struct terminal *term)
render_resize(
term,
- (int)roundf(term->width / term->scale),
- (int)roundf(term->height / term->scale),
+ (int)roundf(logical_width),
+ (int)roundf(logical_height),
resize_opts);
}