diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-19 12:50:53 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-19 12:50:53 +1000 |
commit | 7e38cc2e05f4a14a9e4043951b6fcc033cbb41c2 (patch) | |
tree | 7087600aab0e6c0d2391bd1ff74886d81a1f46ad | |
parent | xdg_shell_v6: Use client_pending state instead of current (diff) | |
download | sway-7e38cc2e05f4a14a9e4043951b6fcc033cbb41c2.tar.gz sway-7e38cc2e05f4a14a9e4043951b6fcc033cbb41c2.tar.zst sway-7e38cc2e05f4a14a9e4043951b6fcc033cbb41c2.zip |
arrange_windows(): Calculate workspace properties when fullscreen
-rw-r--r-- | sway/tree/layout.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 56d4e1d2..96d0c567 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -596,12 +596,6 @@ void arrange_windows(struct sway_container *container, | |||
596 | container->name, container->width, container->height, container->x, | 596 | container->name, container->width, container->height, container->x, |
597 | container->y); | 597 | container->y); |
598 | 598 | ||
599 | if (container->type == C_WORKSPACE | ||
600 | && container->sway_workspace->fullscreen) { | ||
601 | view_configure(container->sway_workspace->fullscreen, 0, 0, | ||
602 | container->parent->width, container->parent->height); | ||
603 | } | ||
604 | |||
605 | double x = 0, y = 0; | 599 | double x = 0, y = 0; |
606 | switch (container->type) { | 600 | switch (container->type) { |
607 | case C_ROOT: | 601 | case C_ROOT: |
@@ -628,9 +622,6 @@ void arrange_windows(struct sway_container *container, | |||
628 | return; | 622 | return; |
629 | case C_WORKSPACE: | 623 | case C_WORKSPACE: |
630 | { | 624 | { |
631 | if (container->sway_workspace->fullscreen) { | ||
632 | return; | ||
633 | } | ||
634 | struct sway_container *output = | 625 | struct sway_container *output = |
635 | container_parent(container, C_OUTPUT); | 626 | container_parent(container, C_OUTPUT); |
636 | struct wlr_box *area = &output->sway_output->usable_area; | 627 | struct wlr_box *area = &output->sway_output->usable_area; |
@@ -642,6 +633,11 @@ void arrange_windows(struct sway_container *container, | |||
642 | container->y = y = area->y; | 633 | container->y = y = area->y; |
643 | wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", | 634 | wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", |
644 | container->name, container->x, container->y); | 635 | container->name, container->x, container->y); |
636 | if (container->sway_workspace->fullscreen) { | ||
637 | view_configure(container->sway_workspace->fullscreen, 0, 0, | ||
638 | output->width, output->height); | ||
639 | return; | ||
640 | } | ||
645 | } | 641 | } |
646 | // children are properly handled below | 642 | // children are properly handled below |
647 | break; | 643 | break; |