diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-27 05:29:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-27 05:29:47 +0200 |
| commit | 25a8f7dcb836212c8f8cd113a9eb6f46ef6efe12 (patch) | |
| tree | 6e4e16650740ae2ad1f76bdd357d2747e7569a8e /sway/tree | |
| parent | b63669a2a04027a029e7332ca4e7670457f59fd2 (diff) | |
| parent | 65328ef60c9468ae44b4b1d6316d604c47293ec3 (diff) | |
Merge pull request #2994 from RyanDwyer/respect-lone-child-border
Respect border settings when rendering lone tabbed/stacked child
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/view.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 4bc9e0f3..5a1b2e37 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -242,23 +242,23 @@ void view_autoconfigure(struct sway_view *view) { view->border_bottom = bottom_y != ws->y + ws->height; } - double x, y, width, height; - x = y = width = height = 0; - double y_offset = 0; - // In a tabbed or stacked container, the container's y is the top of the // title area. We have to offset the surface y by the height of the title, // bar, and disable any top border because we'll always have the title bar. + double y_offset = 0; enum sway_container_layout layout = container_parent_layout(con); - if (layout == L_TABBED && !container_is_floating(con)) { - y_offset = container_titlebar_height(); - view->border_top = false; - } else if (layout == L_STACKED && !container_is_floating(con)) { - list_t *siblings = container_get_siblings(con); - y_offset = container_titlebar_height() * siblings->length; - view->border_top = false; + list_t *siblings = container_get_siblings(con); + if (siblings->length > 1 && !container_is_floating(con)) { + if (layout == L_TABBED) { + y_offset = container_titlebar_height(); + view->border_top = false; + } else if (layout == L_STACKED) { + y_offset = container_titlebar_height() * siblings->length; + view->border_top = false; + } } + double x, y, width, height = 0; switch (view->border) { case B_CSD: case B_NONE: |