Changeset fa23002 for viewwin.c

Timestamp:

Sep 18, 2010, 5:07:39 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

9116936

Parents:

d574d61

git-author:

David Benjamin <davidben@mit.edu> (08/01/10 14:55:49)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:39)

Message:

Never move the screen up when during an owl_viewwin_down

We already can get in such a state, and a searchable popwin will be even
easier. Mimic less's behavior here.

File:

• viewwin.c (modified) (1 diff)

viewwin.c

@@ -119 +119 @@
   int winlines;
   owl_window_get_position(v->window, &winlines, 0, 0, 0);
-  v->topline += amount;
-  if ( (v->topline+winlines-BOTTOM_OFFSET) > v->textlines) {
-    v->topline = v->textlines - winlines + BOTTOM_OFFSET;
-  }
-  owl_viewwin_dirty(v);
+  /* Don't scroll past the bottom. */
+  amount = MIN(amount, v->textlines - (v->topline + winlines - BOTTOM_OFFSET));
+  /* But if we're already past the bottom, don't back up either. */
+  if (amount > 0) {
+    v->topline += amount;
+    owl_viewwin_dirty(v);
+  }
 }