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

Remove title indentation in nested containers. (#2330) 

This commit removes the title indentation in certain nested container
situations. The behavior was considered broken as it didn't seem to
make sense and it was unclear why this was introduced.

Given that nobody on i3-discuss@ complained about removing this logic
within two weeks, we are now removing it to make the title rendering
code a little less complex.

fixes #2247
This commit is contained in:
Ingo Bürk 2016-05-01 18:59:50 +02:00 committed by Michael Stapelberg
parent 4365f46d1b
commit 3b089d0771
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/x.c
View File

@ -566,23 +566,6 @@ void x_draw_decoration(Con *con) {
if (win->name == NULL) if (win->name == NULL)
goto copy_pixmaps; goto copy_pixmaps;
int indent_level = 0,
indent_mult = 0;
Con *il_parent = parent;
if (il_parent->layout != L_STACKED) {
while (1) {
//DLOG("il_parent = %p, layout = %d\n", il_parent, il_parent->layout);
if (il_parent->layout == L_STACKED)
indent_level++;
if (il_parent->type == CT_WORKSPACE || il_parent->type == CT_DOCKAREA || il_parent->type == CT_OUTPUT)
break;
il_parent = il_parent->parent;
indent_mult++;
}
}
//DLOG("indent_level = %d, indent_mult = %d\n", indent_level, indent_mult);
int indent_px = (indent_level * 5) * indent_mult;
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("");
@ -618,9 +601,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.x + logical_px(2),
con->deco_rect.y + text_offset_y, con->deco_rect.y + text_offset_y,
con->deco_rect.width - indent_px - 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);