mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2494 from RyanDwyer/fix-overflowing-subsurfaces

Browse source 
Allow subsurfaces which overflow the container to be interacted with
This commit is contained in:
Drew DeVault 2018-08-27 12:41:39 -04:00 committed by GitHub
parent 9d9de97c4c 4afb2e3f24
commit 82423b88b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/tree/container.c
View file

@ -476,10 +476,11 @@ struct sway_container *container_at(struct sway_container *workspace,
return NULL; return NULL;
} }
struct sway_container *c; struct sway_container *c;
// Focused view's popups
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = struct sway_container *focus =
seat_get_focus_inactive(seat, &root_container); seat_get_focus_inactive(seat, &root_container);
bool is_floating = focus && container_is_floating_or_child(focus);
// Focused view's popups
if (focus && focus->type == C_VIEW) { if (focus && focus->type == C_VIEW) {
surface_at_view(focus, lx, ly, surface, sx, sy); surface_at_view(focus, lx, ly, surface, sx, sy);
if (*surface && surface_is_popup(*surface)) { if (*surface && surface_is_popup(*surface)) {
@ -487,11 +488,27 @@ struct sway_container *container_at(struct sway_container *workspace,
} }
*surface = NULL; *surface = NULL;
} }
// Floating // If focused is floating, focused view's non-popups
if (focus && focus->type == C_VIEW && is_floating) {
surface_at_view(focus, lx, ly, surface, sx, sy);
if (*surface) {
return focus;
}
*surface = NULL;
}
// Floating (non-focused)
if ((c = floating_container_at(lx, ly, surface, sx, sy))) { if ((c = floating_container_at(lx, ly, surface, sx, sy))) {
return c; return c;
} }
// Tiling // If focused is tiling, focused view's non-popups
if (focus && focus->type == C_VIEW && !is_floating) {
surface_at_view(focus, lx, ly, surface, sx, sy);
if (*surface) {
return focus;
}
*surface = NULL;
}
// Tiling (non-focused)
if ((c = tiling_container_at(workspace, lx, ly, surface, sx, sy))) { if ((c = tiling_container_at(workspace, lx, ly, surface, sx, sy))) {
return c; return c;
} }