From 5c1e5988f92c010eb17d156aacc0eabd8101022a Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 29 Mar 2014 20:26:49 +0100 Subject: [PATCH] core: fix alignment of lines in merged buffers (closes #43) The bug happened when options weechat.look.prefix_align and weechat.look.prefix_buffer_align are set to "none". --- ChangeLog.asciidoc | 3 +++ src/gui/gui-line.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index a635fe234..703e6e91b 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -15,6 +15,9 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] == Version 0.4.4 (under dev) +* core: fix alignment of lines in merged buffers when options + weechat.look.prefix_align and weechat.look.prefix_buffer_align are set to + "none" (closes #43) * core: quit WeeChat on signal SIGHUP, remove signal "signal_sighup" * core: add text search in buffers with free content (task #13051) * core: add buffer property "clear" diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c index 505be7b10..174c94a06 100644 --- a/src/gui/gui-line.c +++ b/src/gui/gui-line.c @@ -276,7 +276,7 @@ gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line, { if ((CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_NONE) && (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_NONE)) - length_buffer = gui_chat_strlen_screen (gui_buffer_get_short_name (buffer)) + 1; + length_buffer = gui_chat_strlen_screen (gui_buffer_get_short_name (line->data->buffer)) + 1; else { if (CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_NONE)