diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-07-16 10:26:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 10:26:45 -0400 |
| commit | d5ad8c9036f37576af94c6cbbe79e68415bb7e22 (patch) | |
| tree | 001033de86cb34fca09837a643a0818f299cdf3e /sway/layout.c | |
| parent | 7aeedf0264e1745f2993a430a9cfef46a31e75ca (diff) | |
| parent | ad7605675ef5d1fc99653e80c3c846429abfda25 (diff) | |
Merge pull request #754 from thejan2009/containers-inside-tabbed-stacked
Clarify which tabbed/stacked container we want (fixes #751)
Diffstat (limited to 'sway/layout.c')
| -rw-r--r-- | sway/layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/layout.c b/sway/layout.c index 27760f35..3d746ebe 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -538,7 +538,7 @@ void update_geometry(swayc_t *container) { int gap = 0; // apply inner gaps to non-tabbed/stacked containers - swayc_t *p = swayc_tabbed_stacked_parent(container); + swayc_t *p = swayc_tabbed_stacked_ancestor(container); if (p == NULL) { gap = update_gap_geometry(container, &geometry); } @@ -803,7 +803,7 @@ static void arrange_windows_r(swayc_t *container, double width, double height) { y = container->border_geometry.origin.y; } - // update container size if it's a child in a tabbed/stacked layout + // update container size if it's a direct child in a tabbed/stacked layout if (swayc_tabbed_stacked_parent(container) != NULL) { // Use parent actual_geometry as a base for calculating // container geometry |