aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-07 20:40:05 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 22:49:59 +1000
commit832ebc896655cb5ca7689559d4e42b426d764e71 (patch)
tree1a3bc3ff7fb13d7ed5e86ad67a05739d4c4a1de3 /sway/tree
parent6cb0e58c6d26efa2bca9b3710df08ed1aea09aea (diff)
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/tree')
-rw-r--r--sway/tree/view.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 73ce55ac..edf771c1 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1042,7 +1042,14 @@ bool view_is_visible(struct sway_view *view) {
// Check view isn't hidden by another fullscreen view
if (workspace->fullscreen &&
!container_is_fullscreen_or_child(view->container)) {
- return false;
+ // However, if we're transient for the fullscreen view and we allow
+ // "popups" during fullscreen then it might be visible
+ bool is_transient = config->popup_during_fullscreen == POPUP_SMART &&
+ workspace->fullscreen->view &&
+ view_is_transient_for(view, workspace->fullscreen->view);
+ if (!is_transient) {
+ return false;
+ }
}
return true;
}
@@ -1095,3 +1102,9 @@ void view_save_buffer(struct sway_view *view) {
view->saved_buffer_height = view->surface->current.height;
}
}
+
+bool view_is_transient_for(struct sway_view *child,
+ struct sway_view *ancestor) {
+ return child->impl->is_transient_for &&
+ child->impl->is_transient_for(child, ancestor);
+}