aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 23:50:43 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-10-08 23:50:43 +1000
commitd21d2c8665f8fdaad719bb81cc636052f7c1d1a1 (patch)
treeb8c7f95946f67238fe3f8cc892e77e76be124f5b /sway/tree
parentb8002fc0c4c7e517665cb78ab206338f7f7560a7 (diff)
Remove duplicate code
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/view.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index b107d871..97525d6b 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -575,6 +575,16 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
view_set_tiled(view, true);
}
+ if (config->popup_during_fullscreen == POPUP_LEAVE &&
+ view->container->workspace &&
+ view->container->workspace->fullscreen &&
+ view->container->workspace->fullscreen->view) {
+ struct sway_container *fs = view->container->workspace->fullscreen;
+ if (view_is_transient_for(view, fs->view)) {
+ container_set_fullscreen(fs, false);
+ }
+ }
+
if (should_focus(view)) {
input_manager_set_focus(input_manager, &view->container->node);
}