diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 23:50:43 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 23:50:43 +1000 |
commit | d21d2c8665f8fdaad719bb81cc636052f7c1d1a1 (patch) | |
tree | b8c7f95946f67238fe3f8cc892e77e76be124f5b /sway/tree/view.c | |
parent | Look for any ancestor when checking for fullscreen exit (diff) | |
download | sway-d21d2c8665f8fdaad719bb81cc636052f7c1d1a1.tar.gz sway-d21d2c8665f8fdaad719bb81cc636052f7c1d1a1.tar.zst sway-d21d2c8665f8fdaad719bb81cc636052f7c1d1a1.zip |
Remove duplicate code
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r-- | sway/tree/view.c | 10 |
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) { | |||
575 | view_set_tiled(view, true); | 575 | view_set_tiled(view, true); |
576 | } | 576 | } |
577 | 577 | ||
578 | if (config->popup_during_fullscreen == POPUP_LEAVE && | ||
579 | view->container->workspace && | ||
580 | view->container->workspace->fullscreen && | ||
581 | view->container->workspace->fullscreen->view) { | ||
582 | struct sway_container *fs = view->container->workspace->fullscreen; | ||
583 | if (view_is_transient_for(view, fs->view)) { | ||
584 | container_set_fullscreen(fs, false); | ||
585 | } | ||
586 | } | ||
587 | |||
578 | if (should_focus(view)) { | 588 | if (should_focus(view)) { |
579 | input_manager_set_focus(input_manager, &view->container->node); | 589 | input_manager_set_focus(input_manager, &view->container->node); |
580 | } | 590 | } |