From fcc11f977102524d4f8fe78d60d9d99936b15b67 Mon Sep 17 00:00:00 2001 From: Konstantin Pospelov Date: Sat, 19 May 2018 18:15:25 +0300 Subject: [PATCH] Fix pixel bar below title This commit changes how the left and right indents are calculated for the title bottom pixel bar, so that it is displayed properly in case the left or right border is hidden. --- sway/desktop/output.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 94562052..ebb3ddaa 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -383,21 +383,21 @@ static void render_container_simple_border_normal(struct sway_output *output, scale_box(&box, output_scale); 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 + view->border_thickness; - box.y = view->y - 1; - box.width = con->width - view->border_thickness * 2; - box.height = 1; - scale_box(&box, output_scale); - render_rect(output->wlr_output, output_damage, &box, color); - // Setting these makes marks and title easier size_t inner_x = con->x + view->border_thickness * view->border_left; size_t inner_width = con->width - view->border_thickness * view->border_left - view->border_thickness * view->border_right; + // Single pixel bar below title + memcpy(&color, colors->border, sizeof(float) * 4); + color[3] *= con->alpha; + box.x = inner_x; + box.y = view->y - 1; + box.width = inner_width; + box.height = 1; + scale_box(&box, output_scale); + render_rect(output->wlr_output, output_damage, &box, color); + // Marks size_t marks_width = 0; if (config->show_marks && marks_texture) {