blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rootston: fix cursor coordinates for rotated subsurfaces

This commit is contained in:
emersion 2017-10-04 21:17:16 +02:00
parent dd07618727
commit 09a6d863cf
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rootston/desktop.c
View File

@ -93,17 +93,6 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
double view_sx = lx - view->x; double view_sx = lx - view->x;
double view_sy = ly - view->y; double view_sy = ly - view->y;
double sub_x, sub_y;
struct wlr_subsurface *subsurface =
subsurface_at(view->wlr_surface, view_sx, view_sy, &sub_x, &sub_y);
if (subsurface) {
*sx = view_sx - sub_x;
*sy = view_sy - sub_y;
*surface = subsurface->surface;
return view;
}
struct wlr_box box; struct wlr_box box;
view_get_input_bounds(view, &box); view_get_input_bounds(view, &box);
if (view->rotation != 0.0) { if (view->rotation != 0.0) {
@ -117,6 +106,16 @@ struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
view_sy = (double)box.height/2 + ry; view_sy = (double)box.height/2 + ry;
} }
double sub_x, sub_y;
struct wlr_subsurface *subsurface =
subsurface_at(view->wlr_surface, view_sx, view_sy, &sub_x, &sub_y);
if (subsurface) {
*sx = view_sx - sub_x;
*sy = view_sy - sub_y;
*surface = subsurface->surface;
return view;
}
if (wlr_box_contains_point(&box, view_sx, view_sy)) { if (wlr_box_contains_point(&box, view_sx, view_sy)) {
*sx = view_sx; *sx = view_sx;
*sy = view_sy; *sy = view_sy;