Make sure to fill the view when possible

When there were more items than would fit on the screen and the cursor
was at the end of the list, a reload causing items to disappear or
a vertical terminal enlargement would fail to adjust the start offset.
This commit is contained in:
Přemysl Eric Janouch 2018-06-22 17:10:36 +02:00
parent 712334c0ee
commit 4b4277b306
Signed by: p
GPG Key ID: A0420B94F92B9493

View File

@ -491,7 +491,6 @@ fun reload () {
g.cursor = min (g.cursor, int (g.entries.size ()) - 1);
g.offset = min (g.offset, int (g.entries.size ()) - 1);
update ();
if (g.inotify_wd != -1)
inotify_rm_watch (g.inotify_fd, g.inotify_wd);
@ -648,6 +647,10 @@ fun handle (wint_t c, bool is_char) -> bool {
g.cursor = max (g.cursor, 0);
g.cursor = min (g.cursor, int (g.entries.size ()) - 1);
// Decrease the offset when more items can suddenly fit
int pushable = visible_lines () - (int (g.entries.size ()) - g.offset);
g.offset -= max (pushable, 0);
// Make sure cursor is visible
g.offset = max (g.offset, 0);
g.offset = min (g.offset, int (g.entries.size ()) - 1);
@ -791,6 +794,7 @@ int main (int argc, char *argv[]) {
load_configuration ();
reload ();
update ();
auto start_dir = g.cwd;
wint_t c;