diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 23:00:36 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 23:00:36 +1000 |
commit | f23588de3c7085830614f6764a5c0cd262538afd (patch) | |
tree | 6460aecbaf206dffcc4ffb546c4a8143025b82db /sway/input/seat.c | |
parent | Implement popup_during_fullscreen (diff) | |
download | sway-f23588de3c7085830614f6764a5c0cd262538afd.tar.gz sway-f23588de3c7085830614f6764a5c0cd262538afd.tar.zst sway-f23588de3c7085830614f6764a5c0cd262538afd.zip |
Introduce container_is_transient_for
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 690b59e6..f418785d 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -656,11 +656,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | |||
656 | if (new_workspace && new_workspace->fullscreen && container && | 656 | if (new_workspace && new_workspace->fullscreen && container && |
657 | !container_is_fullscreen_or_child(container)) { | 657 | !container_is_fullscreen_or_child(container)) { |
658 | // Unless it's a transient container | 658 | // Unless it's a transient container |
659 | bool is_transient = new_workspace->fullscreen->view && | 659 | if (!container_is_transient_for(container, new_workspace->fullscreen)) { |
660 | config->popup_during_fullscreen == POPUP_SMART && | ||
661 | container->view && view_is_transient_for( | ||
662 | container->view, new_workspace->fullscreen->view); | ||
663 | if (!is_transient) { | ||
664 | return; | 660 | return; |
665 | } | 661 | } |
666 | } | 662 | } |