koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add decoration_border color for the actual client borders

Browse Source 
see https://github.com/i3/i3/pull/2136
This commit is contained in:
Lauri Tirkkonen
2015-12-28 14:37:42 +02:00
parent cd172da6ae
commit 034a12acad
8 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/x.c
View File

@ -299,7 +299,7 @@ void x_window_kill(xcb_window_t window, kill_window_t kill_window) {
free(event);
}
static void x_draw_decoration_border(Con *con, struct deco_render_params *p) {
static void x_draw_title_border(Con *con, struct deco_render_params *p) {
assert(con->parent != NULL);
Rect *dr = &(con->deco_rect);
@ -344,7 +344,7 @@ static void x_draw_decoration_after_title(Con *con, struct deco_render_params *p
}
/* Redraw the border. */
x_draw_decoration_border(con, p);
x_draw_title_border(con, p);
}
/*
@ -464,21 +464,24 @@ void x_draw_decoration(Con *con) {
* rectangle because some childs are not freely resizable and we want
* their background color to "shine through". */
if (!(borders_to_hide & ADJ_LEFT_SCREEN_EDGE)) {
draw_util_rectangle(conn, &(con->frame_buffer), p->color->background,
0, 0, br.x, r->height);
draw_util_rectangle(conn, &(con->frame_buffer), p->color->decoration_border, 0, 0, br.x, r->height);
}
if (!(borders_to_hide & ADJ_RIGHT_SCREEN_EDGE)) {
draw_util_rectangle(conn, &(con->frame_buffer), p->color->background,
r->width + (br.width + br.x), 0, -(br.width + br.x), r->height);
draw_util_rectangle(conn, &(con->frame_buffer),
p->color->decoration_border, r->width + (br.width + br.x), 0,
-(br.width + br.x), r->height);
}
if (!(borders_to_hide & ADJ_LOWER_SCREEN_EDGE)) {
draw_util_rectangle(conn, &(con->frame_buffer), p->color->background,
br.x, r->height + (br.height + br.y), r->width + br.width, -(br.height + br.y));
draw_util_rectangle(conn, &(con->frame_buffer),
p->color->decoration_border, br.x, r->height + (br.height +
br.y),
r->width + br.width, -(br.height + br.y));
}
/* pixel border needs an additional line at the top */
if (p->border_style == BS_PIXEL && !(borders_to_hide & ADJ_UPPER_SCREEN_EDGE)) {
draw_util_rectangle(conn, &(con->frame_buffer), p->color->background,
br.x, 0, r->width + br.width, br.y);
draw_util_rectangle(conn, &(con->frame_buffer),
p->color->decoration_border, br.x, 0, r->width + br.width,
br.y);
}
/* Highlight the side of the border at which the next window will be
@ -521,7 +524,7 @@ void x_draw_decoration(Con *con) {
con->deco_rect.x, con->deco_rect.y, con->deco_rect.width, con->deco_rect.height);
/* 5: draw two unconnected horizontal lines in border color */
x_draw_decoration_border(con, p);
x_draw_title_border(con, p);
/* 6: draw the title */
int text_offset_y = (con->deco_rect.height - config.font.height) / 2;