diff options
author | Sébastien Helleu <flashcode@flashtux.org> | 2014-03-31 10:31:56 +0200 |
---|---|---|
committer | Sébastien Helleu <flashcode@flashtux.org> | 2014-03-31 10:31:56 +0200 |
commit | 0e561104fa18ee0ba5b38b0679279202ab2f04ae (patch) | |
tree | 9cafab40849c786fbe68a94cbd23385fc3315c4d /src/gui/curses | |
parent | 1fedd443da2f1d4a74b5c120743737003951c563 (diff) | |
download | weechat-0e561104fa18ee0ba5b38b0679279202ab2f04ae.zip |
core: add non-active merged buffers with activity in hotlist (if another merged buffer is zoomed) (task #12845)
There was a bug with "num_displayed" in buffers when they are merged and
that one buffer is zoomed: now the num_displayed is > 0 for the active buffer,
and it is set to 0 for all merged non-active buffers (only in case of zoom).
A variable "zoomed" has been added in buffers to know if a buffer with this
number is zoomed or not (possibly another buffer).
Diffstat (limited to 'src/gui/curses')
-rw-r--r-- | src/gui/curses/gui-curses-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index aaf7b2d28..4d393bb3e 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -1219,7 +1219,9 @@ gui_window_switch_to_buffer (struct t_gui_window *window, } window->buffer = buffer; - gui_buffer_add_value_num_displayed (buffer, 1); + + gui_buffer_set_active_buffer (buffer); + gui_buffer_compute_num_displayed (); if (!weechat_upgrading && (old_buffer != buffer)) gui_hotlist_remove_buffer (buffer); @@ -1263,8 +1265,6 @@ gui_window_switch_to_buffer (struct t_gui_window *window, window->scroll->lines_after = 0; } - gui_buffer_set_active_buffer (buffer); - for (ptr_bar_window = window->bar_windows; ptr_bar_window; ptr_bar_window = ptr_bar_window->next_bar_window) { |