aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-22 13:01:59 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:38:23 +0000
commit4bd62b10058c626cecb5eb15c9c44aee58bf547a (patch)
tree96ae8fbe34ce5839cf625c1d269c6d6863f28867 /render.c
parentwayland: add wayl_fractional_scaling() (diff)
render: maybe_resize(): convert local variable ‘scale’ to float
Diffstat (limited to 'render.c')
-rw-r--r--render.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/render.c b/render.c
index 25249218..3c2e6f18 100644
--- a/render.c
+++ b/render.c
@@ -3868,13 +3868,13 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
if (term->cell_width == 0 && term->cell_height == 0)
return false;
- int scale = -1;
+ float scale = -1;
tll_foreach(term->window->on_outputs, it) {
if (it->item->scale > scale)
scale = it->item->scale;
}
- if (scale < 0) {
+ if (scale < 0.) {
/* Haven't 'entered' an output yet? */
scale = term->scale;
}
@@ -3922,13 +3922,18 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
* Ensure we can scale to logical size, and back to
* pixels without truncating.
*/
- if (width % scale)
- width += scale - width % scale;
- if (height % scale)
- height += scale - height % scale;
+ if (wayl_fractional_scaling(term->wl)) {
+ xassert((int)round(scale) == (int)scale);
- xassert(width % scale == 0);
- xassert(height % scale == 0);
+ int iscale = scale;
+ if (width % iscale)
+ width += iscale - width % iscale;
+ if (height % iscale)
+ height += iscale - height % iscale;
+
+ xassert(width % iscale == 0);
+ xassert(height % iscale == 0);
+ }
break;
}
}