From 3b089d0771e236ea215a40067ad7a04162e9f69d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ingo=20B=C3=BCrk?= Date: Sun, 1 May 2016 18:59:50 +0200 Subject: [PATCH] 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 --- src/x.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/x.c b/src/x.c index 0fbc4d1c..ed23431c 100644 --- a/src/x.c +++ b/src/x.c @@ -566,23 +566,6 @@ void x_draw_decoration(Con *con) { if (win->name == NULL) 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; if (config.show_marks && !TAILQ_EMPTY(&(con->marks_head))) { 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); draw_util_text(title, &(parent->frame_buffer), 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.width - indent_px - mark_width - 2 * logical_px(2)); + con->deco_rect.width - mark_width - 2 * logical_px(2)); if (con->title_format != NULL) I3STRING_FREE(title); -- 2.39.5