mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-20 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Introduce container_is_transient_for

Browse source
This commit is contained in:
Ryan Dwyer 2018-10-08 23:00:36 +10:00
parent 832ebc8966
commit f23588de3c
7 changed files with 30 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/input/cursor.c
View file

@ -99,17 +99,13 @@ static struct sway_node *node_at_coords(
}
if (ws->fullscreen) {
// Try transient containers
if (config->popup_during_fullscreen == POPUP_SMART &&
ws->fullscreen->view) {
for (int i = 0; i < ws->floating->length; ++i) {
struct sway_container *floater = ws->floating->items[i];
if (floater->view && view_is_transient_for(
floater->view, ws->fullscreen->view)) {
struct sway_container *con = tiling_container_at(
&floater->node, lx, ly, surface, sx, sy);
if (con) {
return &con->node;
}
for (int i = 0; i < ws->floating->length; ++i) {
struct sway_container *floater = ws->floating->items[i];
if (container_is_transient_for(floater, ws->fullscreen)) {
struct sway_container *con = tiling_container_at(
&floater->node, lx, ly, surface, sx, sy);
if (con) {
return &con->node;
}
}
}

6
sway/input/seat.c
View file

@ -656,11 +656,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
if (new_workspace && new_workspace->fullscreen && container &&
!container_is_fullscreen_or_child(container)) {
// Unless it's a transient container
bool is_transient = new_workspace->fullscreen->view &&
config->popup_during_fullscreen == POPUP_SMART &&
container->view && view_is_transient_for(
container->view, new_workspace->fullscreen->view);
if (!is_transient) {
if (!container_is_transient_for(container, new_workspace->fullscreen)) {
return;
}
}