summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2010-06-11 16:52:10 +0200
committerSebastien Helleu <flashcode@flashtux.org>2010-06-11 16:52:10 +0200
commitb54af6af0be62ef1ad3c02b93bc99085d5b69116 (patch)
tree61a4fce4dd3763a8b95c50b97ecf8e53669fefcc /src/gui
parentadf74ec691b78b8c0d7dc8c0378039f126df5270 (diff)
downloadweechat-b54af6af0be62ef1ad3c02b93bc99085d5b69116.zip
Fix display bug with attributes like underlined in bars (bug #29889)
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/curses/gui-curses-bar-window.c4
-rw-r--r--src/gui/gui-bar-window.c14
2 files changed, 8 insertions, 10 deletions
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index ba75a13af..0e4366cf9 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -285,6 +285,8 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]));
gui_window_set_custom_color_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ gui_window_remove_color_style (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
+ A_BOLD | A_UNDERLINE | A_REVERSE);
string++;
break;
case GUI_COLOR_SET_WEECHAT_CHAR:
@@ -629,6 +631,8 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]),
CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ gui_window_remove_color_style (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
+ A_BOLD | A_UNDERLINE | A_REVERSE);
wclrtobot (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar);
}
while (x < bar_window->width)
diff --git a/src/gui/gui-bar-window.c b/src/gui/gui-bar-window.c
index be0f2bb55..3c1046e79 100644
--- a/src/gui/gui-bar-window.c
+++ b/src/gui/gui-bar-window.c
@@ -448,19 +448,13 @@ gui_bar_window_content_get_with_filling (struct t_gui_bar_window *bar_window,
return NULL;
snprintf (reinit_color, sizeof (reinit_color),
- "%c%c%02d,%02d",
- GUI_COLOR_COLOR_CHAR,
- GUI_COLOR_FG_BG_CHAR,
- CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]),
- CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ "%c",
+ GUI_COLOR_RESET_CHAR);
length_reinit_color = strlen (reinit_color);
snprintf (reinit_color_space, sizeof (reinit_color_space),
- "%c%c%02d,%02d ",
- GUI_COLOR_COLOR_CHAR,
- GUI_COLOR_FG_BG_CHAR,
- CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]),
- CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ "%c ",
+ GUI_COLOR_RESET_CHAR);
length_reinit_color_space = strlen (reinit_color_space);
content = NULL;