PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-29 23:11:12 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1136 from ailin-nemui/lines

Browse Source 
Make sure the bottom_startline is not lost when removing lines

(cherry picked from commit bf3565a720c0dd2519eb5549508b463b927d7d6f)
This commit is contained in:
ailin-nemui 2019-10-15 12:56:36 +02:00 committed by Ailin Nemui
parent da12a0361b
commit 07472fc569
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fe-text/textbuffer-view.c
View File

@ -1204,14 +1204,14 @@ static void view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line,
LINE_REC *prevline; LINE_REC *prevline;
prevline = view->buffer->first_line == line ? NULL : prevline = view->buffer->first_line == line ? NULL :
textbuffer_line_last(view->buffer); textbuffer_line_last(view->buffer)->prev;
view->cache->last_linecount = prevline == NULL ? 0 : view->cache->last_linecount = prevline == NULL ? 0 :
view_get_linecount(view, prevline); view_get_linecount(view, prevline);
} }
if (view->buffer->first_line == line) {
/* first line in the buffer - this is the most commonly /* first line in the buffer - this is the most commonly
removed line.. */ removed line.. */
if (view->buffer->first_line == line) {
if (view->bottom_startline == line) { if (view->bottom_startline == line) {
/* very small scrollback.. */ /* very small scrollback.. */
view->bottom_startline = view->bottom_startline->next; view->bottom_startline = view->bottom_startline->next;
@ -1288,6 +1288,11 @@ void textbuffer_view_remove_line(TEXT_BUFFER_VIEW_REC *view, LINE_REC *line)
} }
textbuffer_remove(view->buffer, line); textbuffer_remove(view->buffer, line);
if (view->bottom_startline == NULL) {
/* We may have removed the bottom_startline, make sure
that scroll doesn't get stuck */
textbuffer_view_init_bottom(view);
}
} }
void textbuffer_view_remove_lines_by_level(TEXT_BUFFER_VIEW_REC *view, int level) void textbuffer_view_remove_lines_by_level(TEXT_BUFFER_VIEW_REC *view, int level)