From a67e1b587395ebd04f66bff29a25c3f2f9e9e6d1 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Tue, 30 Oct 2018 11:42:37 +0000 Subject: Revert "tree/view.c: fix uninitialized variables warning" This reverts commit 6414b5d288b89c9f3ecde0757f16184071b6036f. --- sway/tree/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway') diff --git a/sway/tree/view.c b/sway/tree/view.c index cf67acbb..5a1b2e37 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -258,7 +258,7 @@ void view_autoconfigure(struct sway_view *view) { } } - double x = 0, y = 0, width = 0, height = 0; + double x, y, width, height = 0; switch (view->border) { case B_CSD: case B_NONE: -- cgit v1.2.3-54-g00ecf From b0fb2846fe5b42d6a55762e90b0858d741cdba52 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Tue, 30 Oct 2018 11:42:44 +0000 Subject: Revert "Respect border settings when rendering lone tabbed/stacked child" This reverts commit 65328ef60c9468ae44b4b1d6316d604c47293ec3. --- sway/desktop/render.c | 7 ------- sway/tree/view.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 18 deletions(-) (limited to 'sway') diff --git a/sway/desktop/render.c b/sway/desktop/render.c index c1fa0c8c..1a72f752 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -781,13 +781,6 @@ static void render_containers_stacked(struct sway_output *output, static void render_containers(struct sway_output *output, pixman_region32_t *damage, struct parent_data *parent) { - if (parent->children->length == 1) { - struct sway_container *child = parent->children->items[0]; - if (child->view) { - render_containers_linear(output, damage, parent); - return; - } - } switch (parent->layout) { case L_NONE: case L_HORIZ: 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: -- cgit v1.2.3-54-g00ecf