Apply the zoom transformation before the output transformation
The zoom translation is just a scale and a translate. The translation
is calculated based on the coordinates of the pointer which are in
global space. Previously the calculated translation was transformed by
the output transformation so that when the zoom transform is applied
after the output transform then it will be correct. However if we just
apply the zoom transformation first then we get the same result
without the zoom code having to be aware of the output transformation.
This also fixes weston_output_transform_coordinate which was applying
the output and zoom transforms in the wrong order.
https://bugs.freedesktop.org/show_bug.cgi?id=78211
diff --git a/src/compositor.c b/src/compositor.c
index 3d65e4c..cd1ca9a 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3198,8 +3198,6 @@
2.0 / output->width,
-2.0 / output->height, 1);
- weston_output_compute_transform(output);
-
if (output->zoom.active) {
magnification = 1 / (1 - output->zoom.spring_z.current);
weston_output_update_zoom(output);
@@ -3209,6 +3207,8 @@
magnification, 1.0);
}
+ weston_output_compute_transform(output);
+
output->dirty = 0;
}