diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-07 20:40:05 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 22:49:59 +1000 |
commit | 832ebc896655cb5ca7689559d4e42b426d764e71 (patch) | |
tree | 1a3bc3ff7fb13d7ed5e86ad67a05739d4c4a1de3 /sway/input/seat.c | |
parent | Merge pull request #2791 from RyanDwyer/status-command-optional (diff) | |
download | sway-832ebc896655cb5ca7689559d4e42b426d764e71.tar.gz sway-832ebc896655cb5ca7689559d4e42b426d764e71.tar.zst sway-832ebc896655cb5ca7689559d4e42b426d764e71.zip |
Implement popup_during_fullscreen
This introduces a new view_impl function: is_transient_for. Similar to
container_has_ancestor but works using the surface parents rather than
the tree.
This patch modifies view_is_visible, container_at and so on to allow
transient views to function normally when they're in front of a
fullscreen view.
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index f5cb2f9e..690b59e6 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -655,7 +655,14 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | |||
655 | // Deny setting focus to a view which is hidden by a fullscreen container | 655 | // Deny setting focus to a view which is hidden by a fullscreen container |
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 | return; | 658 | // Unless it's a transient container |
659 | bool is_transient = new_workspace->fullscreen->view && | ||
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; | ||
665 | } | ||
659 | } | 666 | } |
660 | 667 | ||
661 | struct sway_output *last_output = last_workspace ? | 668 | struct sway_output *last_output = last_workspace ? |