[Aptitude-svn-commit] r3914 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Thu Aug 18 01:01:40 2005
New Revision: 3914

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc
Log:
Don't pointlessly scroll the screen at the end of the list.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Aug 18 01:01:40 2005
@@ -1,5 +1,10 @@
 2005-08-17  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_tree.cc:
+
+	  Fix the bug that caused the screen to scroll pointlessly at the
+	  end of the list.
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Check for unresolved hardened deps both when enqueuing solutions

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc	Thu Aug 18 01:01:40 2005
@@ -332,7 +332,9 @@
       ++newline;
       moved = true;
 
-      if(newline > height)
+      // If we fell off the end of the screen and not off the end of
+      // the list, scroll the screen forward.
+      if(newline > height && selected != end)
 	{
 	  if(hierarchical)
 	    ++top;
@@ -350,6 +352,8 @@
 	--selected;
       else
 	selected.move_backward_level();
+
+      --newline;
     }
 
   if(orig != selected)