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/desktop/output.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/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index cfb5a710..0bcdcac1 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -329,6 +329,17 @@ static void send_frame_done(struct sway_output *output, struct timespec *when) { | |||
329 | workspace->current.fullscreen, &data); | 329 | workspace->current.fullscreen, &data); |
330 | container_for_each_child(workspace->current.fullscreen, | 330 | container_for_each_child(workspace->current.fullscreen, |
331 | send_frame_done_container_iterator, &data); | 331 | send_frame_done_container_iterator, &data); |
332 | if (config->popup_during_fullscreen == POPUP_SMART && | ||
333 | workspace->current.fullscreen->view) { | ||
334 | for (int i = 0; i < workspace->current.floating->length; ++i) { | ||
335 | struct sway_container *floater = | ||
336 | workspace->current.floating->items[i]; | ||
337 | if (floater->view && view_is_transient_for(floater->view, | ||
338 | workspace->current.fullscreen->view)) { | ||
339 | send_frame_done_container_iterator(floater, &data); | ||
340 | } | ||
341 | } | ||
342 | } | ||
332 | #ifdef HAVE_XWAYLAND | 343 | #ifdef HAVE_XWAYLAND |
333 | send_frame_done_unmanaged(output, &root->xwayland_unmanaged, when); | 344 | send_frame_done_unmanaged(output, &root->xwayland_unmanaged, when); |
334 | #endif | 345 | #endif |