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

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-12-19 21:13:12 +01:00
parent 4baf944ef0 52ea8ee720
commit 895f8e05c8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/x.c
View File

@ -505,7 +505,7 @@ void x_draw_decoration(Con *con) {
con->deco_rect.width - 2); con->deco_rect.width - 2);
free(title); free(title);
goto copy_pixmaps; goto after_title;
} }
if (win->name == NULL) if (win->name == NULL)
@ -533,6 +533,7 @@ void x_draw_decoration(Con *con) {
con->deco_rect.x + 2 + indent_px, con->deco_rect.y + text_offset_y, con->deco_rect.x + 2 + indent_px, con->deco_rect.y + text_offset_y,
con->deco_rect.width - 2 - indent_px); con->deco_rect.width - 2 - indent_px);
after_title:
/* Since we don’t clip the text at all, it might in some cases be painted /* Since we don’t clip the text at all, it might in some cases be painted
* on the border pixels on the right side of a window. Therefore, we draw * on the border pixels on the right side of a window. Therefore, we draw
* the right border again after rendering the text (and the unconnected * the right border again after rendering the text (and the unconnected