aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2018-10-30 11:42:44 +0000
committerRostislav Pehlivanov <atomnuker@gmail.com>2018-10-30 11:42:44 +0000
commitb0fb2846fe5b42d6a55762e90b0858d741cdba52 (patch)
tree07937a4f9aadb92046b34a6bbddae6778ceec7d3 /sway/tree
parenta67e1b587395ebd04f66bff29a25c3f2f9e9e6d1 (diff)
downloadsway-b0fb2846fe5b42d6a55762e90b0858d741cdba52.tar.xz
Revert "Respect border settings when rendering lone tabbed/stacked child"
This reverts commit 65328ef60c9468ae44b4b1d6316d604c47293ec3.
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/view.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 5a1b2e37..4bc9e0f3 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);
- 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;
- }
+ 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;
}
- double x, y, width, height = 0;
switch (view->border) {
case B_CSD:
case B_NONE: