pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-24 20:06:38 +02:00
Code Activity

core: fix bar item "scroll" after /buffer clear (closes #448)

Browse Source
This commit is contained in:
Sébastien Helleu
2015-06-22 20:09:52 +02:00
parent 07cbc3bd2e
commit 422958337b
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.asciidoc
+1
View File
@@ -28,6 +28,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
=== Bugs fixed
* core: fix bar item "scroll" after /buffer clear (closes #448)
* core: fix display of time in bare display when option
weechat.look.buffer_time_format is set to empty string (closes #441)
* fifo: fix send error on Cygwin when something is received in the pipe
src/gui/gui-buffer.c
-13
View File
@@ -2461,25 +2461,12 @@ gui_buffer_is_scrolled (struct t_gui_buffer *buffer)
void
gui_buffer_clear (struct t_gui_buffer *buffer)
{
struct t_gui_window *ptr_win;
if (!buffer)
return;
/* remove all lines */
gui_line_free_all (buffer);
/* remove any scroll for buffer */
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
if (ptr_win->buffer == buffer)
{
ptr_win->scroll->first_line_displayed = 1;
ptr_win->scroll->start_line = NULL;
ptr_win->scroll->start_line_pos = 0;
}
}
gui_hotlist_remove_buffer (buffer, 0);
gui_buffer_ask_chat_refresh (buffer, 2);
src/gui/gui-line.c
+11 -1
View File
@@ -978,7 +978,17 @@ gui_line_remove_from_list (struct t_gui_buffer *buffer,
{
ptr_scroll->start_line = ptr_scroll->start_line->next_line;
ptr_scroll->start_line_pos = 0;
gui_buffer_ask_chat_refresh (buffer, 2);
if (ptr_scroll->start_line)
{
gui_buffer_ask_chat_refresh (buffer, 2);
}
else
{
ptr_scroll->first_line_displayed = 1;
ptr_scroll->scrolling = 0;
ptr_scroll->lines_after = 0;
gui_window_ask_refresh (1);
}
}
}
/* remove line from coords */