dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix M-u behaviour difference before and after reflow

master
C. McEnroe 2020-09-03 15:50:39 -04:00
parent 0968a8ac7c
commit dbc0c3ef40
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui.c
View File

@ -501,7 +501,7 @@ static void windowScrollPage(struct Window *window, int n) {
static void windowScrollUnread(struct Window *window) { static void windowScrollUnread(struct Window *window) {
window->scroll = 0; window->scroll = 0;
windowScroll(window, window->unreadHard - MAIN_LINES); windowScroll(window, window->unreadHard - MAIN_LINES + MarkerLines);
} }
struct Util uiNotifyUtil; struct Util uiNotifyUtil;
@ -536,19 +536,18 @@ void uiWrite(uint id, enum Heat heat, const time_t *src, const char *str) {
struct Window *window = windows.ptrs[windowFor(id)]; struct Window *window = windows.ptrs[windowFor(id)];
time_t ts = (src ? *src : time(NULL)); time_t ts = (src ? *src : time(NULL));
int lines = 0;
if (heat > Ice || !window->ignore) { if (heat > Ice || !window->ignore) {
if (!window->unreadSoft++) window->unreadHard = 0; if (!window->unreadSoft++) window->unreadHard = 0;
} }
if (window->mark && heat > Cold) { if (window->mark && heat > Cold) {
if (!window->unreadWarm++) { if (!window->unreadWarm++) {
window->unreadSoft++; int lines = bufferPush(window->buffer, COLS, false, Cold, ts, "");
lines += bufferPush(window->buffer, COLS, false, Cold, ts, ""); if (window->scroll) windowScroll(window, lines);
} }
if (heat > window->heat) window->heat = heat; if (heat > window->heat) window->heat = heat;
statusUpdate(); statusUpdate();
} }
lines += bufferPush(window->buffer, COLS, window->ignore, heat, ts, str); int lines = bufferPush(window->buffer, COLS, window->ignore, heat, ts, str);
window->unreadHard += lines; window->unreadHard += lines;
if (window->scroll) windowScroll(window, lines); if (window->scroll) windowScroll(window, lines);
if (window == windows.ptrs[windows.show]) windowUpdate(); if (window == windows.ptrs[windows.show]) windowUpdate();