fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-07 11:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

shell: correct position of a surface before rotating it.

Browse source 
How to reproduce: rotate the surface to something like 45 degrees,
resize it drastically, continue to rotate. The surface will jump
some space and the rotation point will not be in the center
of the surface.

Fix is to shift the surface position to match the rotation point
This commit is contained in:
Rafal Mielniczuk 2012-03-21 22:40:20 +01:00 • committed by Kristian Høgsberg
parent 126f85535f
commit 778e629b95
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/shell.c
View file

@ -1284,7 +1284,7 @@ rotate_binding(struct wl_input_device *device, uint32_t time,
(struct weston_surface *) device->pointer_focus;
struct shell_surface *surface;
struct rotate_grab *rotate;
GLfloat dx, dy;
GLfloat dx, dy, cx, cy, cposx, cposy, dposx, dposy;
GLfloat r;
if (base_surface == NULL)
@ -1335,6 +1335,20 @@ rotate_binding(struct wl_input_device *device, uint32_t time,
weston_matrix_init(&rotate->rotation);
}
/* We need to adjust the position of the surface
* in case it was resized in a rotated state before */
cx = 0.5f * surface->surface->geometry.width;
cy = 0.5f * surface->surface->geometry.height;
cposx = surface->surface->geometry.x + cx;
cposy = surface->surface->geometry.y + cy;
dposx = rotate->center.x - cposx;
dposy = rotate->center.y - cposy;
if (dposx != 0 || dposy != 0) {
weston_surface_set_position(base_surface,
base_surface->geometry.x + dposx,
base_surface->geometry.y + dposy);
}
wl_input_device_set_pointer_focus(device, NULL, time, 0, 0);
}