nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2295 from Airblader/bug-2247-2 

Fix rendering of marks (and smaller fixed)
This commit is contained in:
Michael Stapelberg 2016-04-16 06:51:44 -07:00
parent e690e3d483 e9798b7e3e
commit e1b3187f90
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/x.c
View File

@ -327,13 +327,20 @@ static void x_draw_decoration_after_title(Con *con, struct deco_render_params *p
assert(con->parent != NULL); assert(con->parent != NULL);
Rect *dr = &(con->deco_rect); Rect *dr = &(con->deco_rect);
Rect br = con_border_style_rect(con);
/* Redraw the right border to cut off any text that went past it. /* Redraw the right border to cut off any text that went past it.
* This is necessary when the text was drawn using XCB since cutting text off * This is necessary when the text was drawn using XCB since cutting text off
* automatically does not work there. For pango rendering, this isn't necessary. */ * automatically does not work there. For pango rendering, this isn't necessary. */
draw_util_rectangle(conn, &(con->parent->frame_buffer), p->color->background, if (!font_is_pango()) {
dr->x + dr->width + br.width, dr->y, -br.width, dr->height); /* We actually only redraw the far right two pixels as that is the
* distance we keep from the edge (not the entire border width).
* Redrawing the entire border would cause text to be cut off. */
draw_util_rectangle(conn, &(con->parent->frame_buffer), p->color->background,
dr->x + dr->width - 2 * logical_px(1),
dr->y,
2 * logical_px(1),
dr->height);
}
/* Draw a 1px separator line before and after every tab, so that tabs can /* Draw a 1px separator line before and after every tab, so that tabs can
* be easily distinguished. */ * be easily distinguished. */
@ -548,8 +555,9 @@ void x_draw_decoration(Con *con) {
draw_util_text(title, &(parent->frame_buffer), draw_util_text(title, &(parent->frame_buffer),
p->color->text, p->color->background, p->color->text, p->color->background,
con->deco_rect.x + 2, con->deco_rect.y + text_offset_y, con->deco_rect.x + logical_px(2),
con->deco_rect.width - 2); con->deco_rect.y + text_offset_y,
con->deco_rect.width - 2 * logical_px(2));
I3STRING_FREE(title); I3STRING_FREE(title);
goto after_title; goto after_title;
@ -610,8 +618,9 @@ void x_draw_decoration(Con *con) {
i3String *title = con->title_format == NULL ? win->name : con_parse_title_format(con); i3String *title = con->title_format == NULL ? win->name : con_parse_title_format(con);
draw_util_text(title, &(parent->frame_buffer), draw_util_text(title, &(parent->frame_buffer),
p->color->text, p->color->background, p->color->text, p->color->background,
con->deco_rect.x + logical_px(2) + indent_px, con->deco_rect.y + text_offset_y, con->deco_rect.x + logical_px(2) + indent_px,
con->deco_rect.width - logical_px(2) - indent_px - mark_width - logical_px(2)); con->deco_rect.y + text_offset_y,
con->deco_rect.width - indent_px - mark_width - 2 * logical_px(2));
if (con->title_format != NULL) if (con->title_format != NULL)
I3STRING_FREE(title); I3STRING_FREE(title);