Merge pull request #2411 from emersion/fullscreen-pointer-input

Fix pointer events for fullscreen views
This commit is contained in:
Ryan Dwyer 2018-08-03 08:18:09 +10:00 committed by GitHub
commit e07da5fc5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View file

@ -234,6 +234,10 @@ struct sway_container *container_at(struct sway_container *workspace,
double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy);
struct sway_container *container_at_view(struct sway_container *view,
double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy);
/**
* Apply the function for each descendant of the container breadth first.
*/

View file

@ -99,7 +99,8 @@ static struct sway_container *container_at_coords(
return ws;
}
if (ws->sway_workspace->fullscreen) {
return container_at(ws, lx, ly, surface, sx, sy);
return container_at_view(ws->sway_workspace->fullscreen, lx, ly,
surface, sx, sy);
}
if ((*surface = layer_surface_at(output,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],

View file

@ -535,7 +535,7 @@ struct sway_container *container_parent(struct sway_container *container,
return container;
}
static struct sway_container *container_at_view(struct sway_container *swayc,
struct sway_container *container_at_view(struct sway_container *swayc,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (!sway_assert(swayc->type == C_VIEW, "Expected a view")) {