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

Ensure that marks and the title are displayed even if the window title is empty. (#2639) 

Previously rendering marks and the title were skipped if the title is empty. With marks
this is obviously wrong, with the title it is also wrong because title_format might be
set.
This commit is contained in:
Ingo Bürk 2017-01-16 23:00:01 +01:00 committed by Michael Stapelberg
parent 7f84f49846
commit 367811be2d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/x.c
View File

@ -572,9 +572,6 @@ void x_draw_decoration(Con *con) {
goto after_title; goto after_title;
} }
if (win->name == NULL)
goto copy_pixmaps;
int mark_width = 0; int mark_width = 0;
if (config.show_marks && !TAILQ_EMPTY(&(con->marks_head))) { if (config.show_marks && !TAILQ_EMPTY(&(con->marks_head))) {
char *formatted_mark = sstrdup(""); char *formatted_mark = sstrdup("");
@ -608,13 +605,19 @@ 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);
if (title == NULL) {
goto copy_pixmaps;
}
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), con->deco_rect.x + logical_px(2),
con->deco_rect.y + text_offset_y, con->deco_rect.y + text_offset_y,
con->deco_rect.width - mark_width - 2 * logical_px(2)); con->deco_rect.width - mark_width - 2 * logical_px(2));
if (con->title_format != NULL)
if (con->title_format != NULL) {
I3STRING_FREE(title); I3STRING_FREE(title);
}
after_title: after_title:
x_draw_decoration_after_title(con, p); x_draw_decoration_after_title(con, p);