1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 23:36:37 +02:00

core: fix color of highlighted prefix on inactive window when option weechat.look.color_inactive_prefix is off

This commit is contained in:
Sebastien Helleu
2011-09-28 17:46:25 +02:00
parent 677a1b26b2
commit 5ae4ef715a
+17 -4
View File
@@ -533,7 +533,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
int *lines_displayed,
int simulate)
{
char str_space[] = " ", str_plus[] = "+", *prefix_highlighted;
char str_space[] = " ", str_plus[] = "+";
char *prefix_no_color, *prefix_highlighted;
const char *short_name;
int i, length, length_allowed, num_spaces;
struct t_gui_lines *mixed_lines;
@@ -733,13 +734,25 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
prefix_highlighted = NULL;
if (line->data->highlight)
{
prefix_highlighted = gui_color_decode (line->data->prefix, NULL);
prefix_no_color = gui_color_decode (line->data->prefix, NULL);
if (prefix_no_color)
{
length = strlen (prefix_no_color) + 32;
prefix_highlighted = malloc (length);
if (prefix_highlighted)
{
snprintf (prefix_highlighted, length, "%s%s",
GUI_COLOR(GUI_COLOR_CHAT_HIGHLIGHT),
prefix_no_color);
}
free (prefix_no_color);
}
if (!simulate)
{
gui_chat_reset_style (window, line,
GUI_COLOR_CHAT_INACTIVE_WINDOW,
(CONFIG_BOOLEAN(config_look_color_inactive_buffer)
&& CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer)
&& CONFIG_BOOLEAN(config_look_color_inactive_prefix)
&& (!line->data->buffer->active)) ?
GUI_COLOR_CHAT_INACTIVE_BUFFER :
GUI_COLOR_CHAT_HIGHLIGHT,
@@ -753,7 +766,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
gui_chat_reset_style (window, line,
GUI_COLOR_CHAT_INACTIVE_WINDOW,
(CONFIG_BOOLEAN(config_look_color_inactive_buffer)
&& CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer)
&& CONFIG_BOOLEAN(config_look_color_inactive_prefix)
&& (!line->data->buffer->active)) ?
GUI_COLOR_CHAT_INACTIVE_BUFFER :
GUI_COLOR_CHAT,