diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-07-28 07:42:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-28 07:42:43 -0400 |
commit | d07eaed79ffb7284528dfe12f5d37cee8ff555d4 (patch) | |
tree | 567fe64aa50b45e0596a53fdb154df82e57556ab | |
parent | Merge pull request #791 from acrisci/feature/focus-child (diff) | |
parent | bugfix: windows on empty workspaces with layout tabbed/stacked would spawn wi... (diff) | |
download | sway-d07eaed79ffb7284528dfe12f5d37cee8ff555d4.tar.gz sway-d07eaed79ffb7284528dfe12f5d37cee8ff555d4.tar.zst sway-d07eaed79ffb7284528dfe12f5d37cee8ff555d4.zip |
Merge pull request #793 from thejan2009/workspace_layout_first_window_fix
bugfix: invisible windows on empty workspace with tabbed/stacked layout
-rw-r--r-- | sway/layout.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/layout.c b/sway/layout.c index cd5a31bc..fc7a31b4 100644 --- a/sway/layout.c +++ b/sway/layout.c | |||
@@ -799,7 +799,9 @@ static void arrange_windows_r(swayc_t *container, double width, double height) { | |||
799 | } | 799 | } |
800 | 800 | ||
801 | // update container size if it's a direct child in a tabbed/stacked layout | 801 | // update container size if it's a direct child in a tabbed/stacked layout |
802 | if (swayc_tabbed_stacked_parent(container) != NULL) { | 802 | // if parent is a workspace, its actual_geometry won't be initialized |
803 | if (swayc_tabbed_stacked_parent(container) != NULL && | ||
804 | container->parent->type != C_WORKSPACE) { | ||
803 | // Use parent actual_geometry as a base for calculating | 805 | // Use parent actual_geometry as a base for calculating |
804 | // container geometry | 806 | // container geometry |
805 | container->width = container->parent->actual_geometry.size.w; | 807 | container->width = container->parent->actual_geometry.size.w; |