Fix merge commit

This commit is contained in:
Eizen 2016-11-20 00:03:25 -03:00
parent b6dafbd444
commit d605c91790

View File

@ -568,7 +568,8 @@ static dimension_t x_render_layout(cairo_t *c, colored_layout *cl, colored_layou
if (!last) bg_height -= settings.separator_height; if (!last) bg_height -= settings.separator_height;
} }
bg_width -= 2 * settings.frame_width; bg_width -= 2 * settings.frame_width;
bg_height += settings.frame_width; if (last)
bg_height -= settings.frame_width;
cairo_set_source_rgb(c, cl->bg.r, cl->bg.g, cl->bg.b); cairo_set_source_rgb(c, cl->bg.r, cl->bg.g, cl->bg.b);
cairo_rectangle(c, bg_x, bg_y, bg_width, bg_height); cairo_rectangle(c, bg_x, bg_y, bg_width, bg_height);
@ -605,9 +606,7 @@ static dimension_t x_render_layout(cairo_t *c, colored_layout *cl, colored_layou
// the wrong color in the corners. // the wrong color in the corners.
cairo_rectangle(c, 0, dim.y, dim.w, settings.separator_height); cairo_rectangle(c, 0, dim.y, dim.w, settings.separator_height);
else else
cairo_rectangle(c, settings.frame_width, dim.y + settings.frame_width, cairo_rectangle(c, settings.frame_width, dim.y + settings.frame_width, dim.w - 2 * settings.frame_width, settings.separator_height);
dim.w - 2 * settings.frame_width
, settings.separator_height);
cairo_fill(c); cairo_fill(c);
dim.y += settings.separator_height; dim.y += settings.separator_height;