aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge pull request #1952 from H3rnand3zzz/fix/alt-underscroll

Browse Source 
Fix underscrolling issue for alternative scrolling
This commit is contained in:
Michael Vetter 2024-03-01 13:02:34 +01:00 committed by GitHub
commit c6cf27e4e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/window.c
View File

@ -694,7 +694,7 @@ win_page_down(ProfWin* window, int scroll_size)
*page_start += scroll_size; *page_start += scroll_size;
// Scrolled down after reaching the bottom of the page // Scrolled down after reaching the bottom of the page
if ((*page_start == total_rows || (*page_start == page_space && *page_start >= total_rows)) && window->type == WIN_CHAT) { if ((*page_start > total_rows - page_space || (*page_start == page_space && *page_start >= total_rows)) && window->type == WIN_CHAT) {
int bf_size = buffer_size(window->layout->buffer); int bf_size = buffer_size(window->layout->buffer);
if (bf_size > 0) { if (bf_size > 0) {
ProfBuffEntry* last_entry = buffer_get_entry(window->layout->buffer, bf_size - 1); ProfBuffEntry* last_entry = buffer_get_entry(window->layout->buffer, bf_size - 1);
@ -708,19 +708,19 @@ win_page_down(ProfWin* window, int scroll_size)
g_date_time_unref(now); g_date_time_unref(now);
int offset = last_entry->y_end_pos - 1; int offset = last_entry->y_end_pos - 1;
*page_start = offset; *page_start = offset - page_space + scroll_size;
} }
} }
total_rows = getcury(window->layout->win); total_rows = getcury(window->layout->win);
// only got half a screen, show full screen // near the end, but will display only part of the page space, move a bit back to show full page
if ((total_rows - (*page_start)) < page_space) if ((total_rows - *page_start) < page_space) {
*page_start = total_rows - page_space; *page_start = total_rows - page_space;
// went past end, show last page
// went past end, show full screen } else if (*page_start >= total_rows) {
else if (*page_start >= total_rows)
*page_start = total_rows - page_space - 1; *page_start = total_rows - page_space - 1;
}
window->layout->paged = 1; window->layout->paged = 1;
@ -730,7 +730,7 @@ win_page_down(ProfWin* window, int scroll_size)
} }
// switch off page if last line and space line visible // switch off page if last line and space line visible
if ((total_rows) - *page_start == page_space) { if (total_rows - *page_start == page_space) {
window->layout->paged = 0; window->layout->paged = 0;
} }
} }