Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-27 21:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename container_at_view to surface_at_view and make it return void

Browse source
This commit is contained in:
Ryan Dwyer 2018-08-08 22:14:11 +10:00
parent 1e984fec05
commit a0ece6f956
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/tree/container.c
View file

@ -533,11 +533,10 @@ struct sway_container *container_parent(struct sway_container *container,
return container;
}
static struct sway_container *container_at_view(struct sway_container *swayc,
double lx, double ly,
static void surface_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")) {
return NULL;
return;
}
struct sway_view *sview = swayc->sway_view;
double view_sx = lx - sview->x;
@ -568,7 +567,6 @@ static struct sway_container *container_at_view(struct sway_container *swayc,
*sy = _sy;
*surface = _surface;
}
return swayc;
}
/**
@ -681,7 +679,8 @@ struct sway_container *tiling_container_at(
struct sway_container *con, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
if (con->type == C_VIEW) {
return container_at_view(con, lx, ly, surface, sx, sy);
surface_at_view(con, lx, ly, surface, sx, sy);
return con;
}
if (!con->children->length) {
return NULL;
@ -744,7 +743,7 @@ struct sway_container *container_at(struct sway_container *workspace,
struct sway_container *focus =
seat_get_focus_inactive(seat, &root_container);
if (focus && focus->type == C_VIEW) {
container_at_view(focus, lx, ly, surface, sx, sy);
surface_at_view(focus, lx, ly, surface, sx, sy);
if (*surface && surface_is_popup(*surface)) {
return focus;
}