diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2014-03-30 08:34:32 +0200 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2014-03-30 08:34:32 +0200 |
commit | 0cfbae151202a30f009ba164b262db704a9309d5 (patch) | |
tree | ae354b3d53f94440e3655c8ac44adb3396217bd7 /src/gui/curses/gui-curses-bar-window.c | |
parent | 5c1e5988f92c010eb17d156aacc0eabd8101022a (diff) | |
download | weechat-0cfbae151202a30f009ba164b262db704a9309d5.zip |
core: fix reset of attributes in bars when "resetcolor" is used (closes #41)
Diffstat (limited to 'src/gui/curses/gui-curses-bar-window.c')
-rw-r--r-- | src/gui/curses/gui-curses-bar-window.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c index e4fa0583d..86d1a4f19 100644 --- a/src/gui/curses/gui-curses-bar-window.c +++ b/src/gui/curses/gui-curses-bar-window.c @@ -169,7 +169,8 @@ gui_bar_window_print_string (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])); + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]), + 1); } x_with_hidden = *x; @@ -289,7 +290,8 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window, string++; 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])); + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]), + 0); break; default: gui_window_string_apply_color_weechat ((unsigned char **)&string, @@ -313,7 +315,8 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window, A_ALL_ATTR); 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])); + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]), + 1); break; default: next_char = utf8_next_char (string); @@ -640,7 +643,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])); + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]), + 1); gui_window_remove_color_style (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, A_ALL_ATTR); wclrtobot (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar); @@ -684,7 +688,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(config_color_bar_more), - CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG])); + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]), + 1); mvwaddstr (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, y, x, ptr_string); } @@ -703,7 +708,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(config_color_bar_more), - CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG])); + CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]), + 1); mvwaddstr (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar, y, x, ptr_string); } |