diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2011-09-22 23:49:28 +0200 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2011-09-22 23:49:28 +0200 |
| commit | 83a7305bae5c2a88740fd7e2936ee3ddc52423f0 (patch) | |
| tree | 99590dd465b54352353d73d1328c966df9c92c42 /src/gui | |
| parent | 420ce7522ab10e6efeec15fedd031e07e2a5f571 (diff) | |
| download | weechat-83a7305bae5c2a88740fd7e2936ee3ddc52423f0.zip | |
core: fix option weechat.look.color_inactive_message
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/curses/gui-curses-chat.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index 822aca386..0b2196a21 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -283,10 +283,20 @@ gui_chat_string_next_char (struct t_gui_window *window, struct t_gui_line *line, case GUI_COLOR_RESET_CHAR: string++; if (apply_style) - gui_chat_reset_style (window, line, - GUI_COLOR_CHAT_INACTIVE_WINDOW, - GUI_COLOR_CHAT_INACTIVE_BUFFER, - GUI_COLOR_CHAT); + { + if (apply_style_inactive) + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } + else + { + gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, + GUI_COLOR_CHAT); + } + } break; default: return (char *)string; @@ -922,10 +932,20 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line, /* reset color & style for a new line */ if (!simulate) { - gui_chat_reset_style (window, line, - GUI_COLOR_CHAT_INACTIVE_WINDOW, - GUI_COLOR_CHAT_INACTIVE_BUFFER, - GUI_COLOR_CHAT); + if (CONFIG_BOOLEAN(config_look_color_inactive_message)) + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT_INACTIVE_WINDOW, + GUI_COLOR_CHAT_INACTIVE_BUFFER, + GUI_COLOR_CHAT); + } + else + { + gui_chat_reset_style (window, line, + GUI_COLOR_CHAT, + GUI_COLOR_CHAT, + GUI_COLOR_CHAT); + } } if (!line->data->message || !line->data->message[0]) |