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

Merge pull request #3541 from orestisf1993/title_align 

Apply title_align to non-leaf containers
This commit is contained in:
Orestis 2018-12-05 13:09:09 +02:00 committed by GitHub
parent 52d785fb37 a81e22a277
commit 620e90bed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/x.c
View File

@ -613,31 +613,6 @@ void x_draw_decoration(Con *con) {
/* 6: draw the title */ /* 6: draw the title */
int text_offset_y = (con->deco_rect.height - config.font.height) / 2; int text_offset_y = (con->deco_rect.height - config.font.height) / 2;
struct Window *win = con->window;
if (win == NULL) {
i3String *title;
if (con->title_format == NULL) {
char *_title;
char *tree = con_get_tree_representation(con);
sasprintf(&_title, "i3: %s", tree);
free(tree);
title = i3string_from_utf8(_title);
FREE(_title);
} else {
title = con_parse_title_format(con);
}
draw_util_text(title, &(parent->frame_buffer),
p->color->text, p->color->background,
con->deco_rect.x + logical_px(2),
con->deco_rect.y + text_offset_y,
con->deco_rect.width - 2 * logical_px(2));
I3STRING_FREE(title);
goto after_title;
}
const int title_padding = logical_px(2); const int title_padding = logical_px(2);
const int deco_width = (int)con->deco_rect.width; const int deco_width = (int)con->deco_rect.width;
int mark_width = 0; int mark_width = 0;
@ -677,7 +652,23 @@ void x_draw_decoration(Con *con) {
FREE(formatted_mark); FREE(formatted_mark);
} }
i3String *title = con->title_format == NULL ? win->name : con_parse_title_format(con); i3String *title = NULL;
struct Window *win = con->window;
if (win == NULL) {
if (con->title_format == NULL) {
char *_title;
char *tree = con_get_tree_representation(con);
sasprintf(&_title, "i3: %s", tree);
free(tree);
title = i3string_from_utf8(_title);
FREE(_title);
} else {
title = con_parse_title_format(con);
}
} else {
title = con->title_format == NULL ? win->name : con_parse_title_format(con);
}
if (title == NULL) { if (title == NULL) {
goto copy_pixmaps; goto copy_pixmaps;
} }
@ -710,11 +701,10 @@ void x_draw_decoration(Con *con) {
con->deco_rect.y + text_offset_y, con->deco_rect.y + text_offset_y,
deco_width - mark_width - 2 * title_padding); deco_width - mark_width - 2 * title_padding);
if (con->title_format != NULL) { if (win == NULL || con->title_format != NULL) {
I3STRING_FREE(title); I3STRING_FREE(title);
} }
after_title:
x_draw_decoration_after_title(con, p); x_draw_decoration_after_title(con, p);
copy_pixmaps: copy_pixmaps:
draw_util_copy_surface(&(con->frame_buffer), &(con->frame), 0, 0, 0, 0, con->rect.width, con->rect.height); draw_util_copy_surface(&(con->frame_buffer), &(con->frame), 0, 0, 0, 0, con->rect.width, con->rect.height);