3 files changed, 101 insertions, 111 deletions

diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 9af13004..f12386dc 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -55,6 +55,10 @@ struct sway_view {
         char *title_format;
         enum sway_container_border border;
         int border_thickness;
+        bool border_top;
+        bool border_bottom;
+        bool border_left;
+        bool border_right;
 
         list_t *executed_criteria;
 
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 3f89f5cc..0350e437 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -321,15 +321,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
         struct wlr_box box;
         float color[4];
 
-        int other_views = 1;
-        if (config->hide_edge_borders == E_SMART) {
-                struct sway_container *ws = container_parent(con, C_WORKSPACE);
-                other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
-        }
-
-        if (config->hide_edge_borders != E_VERTICAL
-                        && config->hide_edge_borders != E_BOTH
-                        && (config->hide_edge_borders != E_SMART || other_views)) {
+        if (con->sway_view->border_left) {
                 // Child border - left edge
                 memcpy(&color, colors->child_border, sizeof(float) * 4);
                 color[3] *= con->alpha;
@@ -338,7 +330,9 @@ static void render_container_simple_border_normal(struct sway_output *output,
                 box.width = con->sway_view->border_thickness;
                 box.height = con->height - 1;
                 render_rect(output->wlr_output, output_damage, &box, color);
+        }
 
+        if (con->sway_view->border_right) {
                 // Child border - right edge
                 if (con->parent->children->length == 1
                                 && con->parent->layout == L_HORIZ) {
@@ -354,9 +348,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
                 render_rect(output->wlr_output, output_damage, &box, color);
         }
 
-        if (config->hide_edge_borders != E_HORIZONTAL
-                        && config->hide_edge_borders != E_BOTH
-                        && (config->hide_edge_borders != E_SMART || other_views)) {
+        if (con->sway_view->border_bottom) {
                 // Child border - bottom edge
                 if (con->parent->children->length == 1
                                 && con->parent->layout == L_VERT) {
@@ -370,50 +362,55 @@ static void render_container_simple_border_normal(struct sway_output *output,
                 box.width = con->width;
                 box.height = con->sway_view->border_thickness;
                 render_rect(output->wlr_output, output_damage, &box, color);
+        }
 
-                // Single pixel bar above title
-                memcpy(&color, colors->border, sizeof(float) * 4);
-                color[3] *= con->alpha;
-                box.x = con->x;
-                box.y = con->y;
-                box.width = con->width;
-                box.height = 1;
-                render_rect(output->wlr_output, output_damage, &box, color);
-
-                // Single pixel bar below title
-                box.x = con->x + con->sway_view->border_thickness;
-                box.y = con->sway_view->y - 1;
-                box.width = con->width - con->sway_view->border_thickness * 2;
-                box.height = 1;
-                render_rect(output->wlr_output, output_damage, &box, color);
-
-                // Title background
-                memcpy(&color, colors->background, sizeof(float) * 4);
-                color[3] *= con->alpha;
-                box.x = con->x + con->sway_view->border_thickness;
-                box.y = con->y + 1;
-                box.width = con->width - con->sway_view->border_thickness * 2;
-                box.height = con->sway_view->y - con->y - 2;
-                render_rect(output->wlr_output, output_damage, &box, color);
-
-                // Title text
-                if (title_texture) {
-                        float output_scale = output->wlr_output->scale;
-                        struct wlr_box texture_box = {
-                                .x = box.x * output_scale,
-                                .y = box.y * output_scale,
-                        };
-                        wlr_texture_get_size(title_texture,
-                                &texture_box.width, &texture_box.height);
-
-                        float matrix[9];
-                        wlr_matrix_project_box(matrix, &texture_box,
-                                WL_OUTPUT_TRANSFORM_NORMAL,
-                                0.0, output->wlr_output->transform_matrix);
-
-                        render_texture(output->wlr_output, output_damage, title_texture,
-                                &texture_box, matrix, 1.0);
-                }
+        // Single pixel bar above title
+        memcpy(&color, colors->border, sizeof(float) * 4);
+        color[3] *= con->alpha;
+        box.x = con->x;
+        box.y = con->y;
+        box.width = con->width;
+        box.height = 1;
+        render_rect(output->wlr_output, output_damage, &box, color);
+
+        // Single pixel bar below title
+        memcpy(&color, colors->border, sizeof(float) * 4);
+        color[3] *= con->alpha;
+        box.x = con->x + con->sway_view->border_thickness;
+        box.y = con->sway_view->y - 1;
+        box.width = con->width - con->sway_view->border_thickness * 2;
+        box.height = 1;
+        render_rect(output->wlr_output, output_damage, &box, color);
+
+        // Title background
+        memcpy(&color, colors->background, sizeof(float) * 4);
+        color[3] *= con->alpha;
+        box.x = con->x
+                + con->sway_view->border_thickness * con->sway_view->border_left;
+        box.y = con->y + 1;
+        box.width = con->width
+                - con->sway_view->border_thickness * con->sway_view->border_left
+                - con->sway_view->border_thickness * con->sway_view->border_right;
+        box.height = con->sway_view->y - con->y - 2;
+        render_rect(output->wlr_output, output_damage, &box, color);
+
+        // Title text
+        if (title_texture) {
+                float output_scale = output->wlr_output->scale;
+                struct wlr_box texture_box = {
+                        .x = box.x * output_scale,
+                        .y = box.y * output_scale,
+                };
+                wlr_texture_get_size(title_texture,
+                        &texture_box.width, &texture_box.height);
+
+                float matrix[9];
+                wlr_matrix_project_box(matrix, &texture_box,
+                        WL_OUTPUT_TRANSFORM_NORMAL,
+                        0.0, output->wlr_output->transform_matrix);
+
+                render_texture(output->wlr_output, output_damage, title_texture,
+                        &texture_box, matrix, 1.0);
         }
 }
 
@@ -426,15 +423,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
         struct wlr_box box;
         float color[4];
 
-        int other_views = 1;
-        if (config->hide_edge_borders == E_SMART) {
-                struct sway_container *ws = container_parent(con, C_WORKSPACE);
-                other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
-        }
-
-        if (config->hide_edge_borders != E_VERTICAL
-                        && config->hide_edge_borders != E_BOTH
-                        && (config->hide_edge_borders != E_SMART || other_views)) {
+        if (con->sway_view->border_left) {
                 // Child border - left edge
                 memcpy(&color, colors->child_border, sizeof(float) * 4);
                 color[3] *= con->alpha;
@@ -443,7 +432,9 @@ static void render_container_simple_border_pixel(struct sway_output *output,
                 box.width = con->sway_view->border_thickness;
                 box.height = con->height;
                 render_rect(output->wlr_output, output_damage, &box, color);
+        }
 
+        if (con->sway_view->border_right) {
                 // Child border - right edge
                 if (con->parent->children->length == 1
                                 && con->parent->layout == L_HORIZ) {
@@ -459,16 +450,18 @@ static void render_container_simple_border_pixel(struct sway_output *output,
                 render_rect(output->wlr_output, output_damage, &box, color);
         }
 
-        if (config->hide_edge_borders != E_HORIZONTAL
-                        && config->hide_edge_borders != E_BOTH
-                        && (config->hide_edge_borders != E_SMART || other_views)) {
+        if (con->sway_view->border_top) {
                 // Child border - top edge
+                memcpy(&color, colors->child_border, sizeof(float) * 4);
+                color[3] *= con->alpha;
                 box.x = con->x;
                 box.y = con->y;
                 box.width = con->width;
                 box.height = con->sway_view->border_thickness;
                 render_rect(output->wlr_output, output_damage, &box, color);
+        }
 
+        if (con->sway_view->border_bottom) {
                 // Child border - bottom edge
                 if (con->parent->children->length == 1
                                 && con->parent->layout == L_VERT) {
diff --git a/sway/tree/view.c b/sway/tree/view.c
index e0e3c110..8da72667 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -120,8 +120,9 @@ void view_autoconfigure(struct sway_view *view) {
                 return;
         }
 
+        struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+
         if (view->is_fullscreen) {
-                struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
                 view_configure(view, 0, 0, output->width, output->height);
                 view->x = view->y = 0;
                 return;
@@ -133,6 +134,25 @@ void view_autoconfigure(struct sway_view *view) {
                 other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
         }
 
+        view->border_top = view->border_bottom = true;
+        view->border_left = view->border_right = true;
+        if (view->swayc->layout != L_FLOATING) {
+                if (config->hide_edge_borders == E_BOTH
+                                || config->hide_edge_borders == E_VERTICAL
+                                || (config->hide_edge_borders == E_SMART && !other_views)) {
+                        view->border_left = view->swayc->x != 0;
+                        int right_x = view->swayc->x + view->swayc->width;
+                        view->border_right = right_x != output->width;
+                }
+                if (config->hide_edge_borders == E_BOTH
+                                || config->hide_edge_borders == E_HORIZONTAL
+                                || (config->hide_edge_borders == E_SMART && !other_views)) {
+                        view->border_top = view->swayc->y != 0;
+                        int bottom_y = view->swayc->y + view->swayc->height;
+                        view->border_bottom = bottom_y != output->height;
+                }
+        }
+
         double x, y, width, height;
         x = y = width = height = 0;
         switch (view->border) {
@@ -143,51 +163,24 @@ void view_autoconfigure(struct sway_view *view) {
                 height = view->swayc->height;
                 break;
         case B_PIXEL:
-                if (view->swayc->layout > L_VERT
-                                || config->hide_edge_borders == E_NONE
-                                || config->hide_edge_borders == E_HORIZONTAL
-                                || (config->hide_edge_borders == E_SMART && other_views)) {
-                        x = view->swayc->x + view->border_thickness;
-                        width = view->swayc->width - view->border_thickness * 2;
-                } else {
-                        x = view->swayc->x;
-                        width = view->swayc->width;
-                }
-                if (view->swayc->layout > L_VERT
-                                || config->hide_edge_borders == E_NONE
-                                || config->hide_edge_borders == E_VERTICAL
-                                || (config->hide_edge_borders == E_SMART && other_views)) {
-                        y = view->swayc->y + view->border_thickness;
-                        height = view->swayc->height - view->border_thickness * 2;
-                } else {
-                        y = view->swayc->y;
-                        height = view->swayc->height;
-                }
+                x = view->swayc->x + view->border_thickness * view->border_left;
+                y = view->swayc->y + view->border_thickness * view->border_top;
+                width = view->swayc->width
+                        - view->border_thickness * view->border_left
+                        - view->border_thickness * view->border_right;
+                height = view->swayc->height
+                        - view->border_thickness * view->border_top
+                        - view->border_thickness * view->border_bottom;
                 break;
         case B_NORMAL:
-                if (view->swayc->layout > L_VERT
-                                || config->hide_edge_borders == E_NONE
-                                || config->hide_edge_borders == E_HORIZONTAL
-                                || (config->hide_edge_borders == E_SMART && other_views)) {
-                        x = view->swayc->x + view->border_thickness;
-                        width = view->swayc->width - view->border_thickness * 2;
-                } else {
-                        x = view->swayc->x;
-                        width = view->swayc->width;
-                }
-                if (view->swayc->layout > L_VERT
-                                || config->hide_edge_borders == E_NONE
-                                || config->hide_edge_borders == E_VERTICAL
-                                || (config->hide_edge_borders == E_SMART && other_views)) {
-                        // Height is: border + title height + border + view height + border
-                        y = view->swayc->y + config->font_height
-                                + view->border_thickness * 2;
-                        height = view->swayc->height - config->font_height
-                                - view->border_thickness * 3;
-                } else {
-                        y = view->swayc->y;
-                        height = view->swayc->height;
-                }
+                // Height is: border + title height + border + view height + border
+                x = view->swayc->x + view->border_thickness * view->border_left;
+                y = view->swayc->y + config->font_height + view->border_thickness * 2;
+                width = view->swayc->width
+                        - view->border_thickness * view->border_left
+                        - view->border_thickness * view->border_right;
+                height = view->swayc->height - config->font_height
+                        - view->border_thickness * (2 + view->border_bottom);
                 break;
         }