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

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 17 01:59:39 2005
New Revision: 3885

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc
Log:
Handle the special case of the first element in a tree being unselectable in line_up().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 01:59:39 2005
@@ -1,5 +1,10 @@
 2005-08-16  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_tree.cc:
+
+	  Handle the case of the first element in a tree being
+	  unselectable in line_up().
+
 	* src/solution_screen.cc:
 
 	  Add and activate support for displaying a "story" in the visual

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	Wed Aug 17 01:59:39 2005
@@ -427,6 +427,17 @@
 	}
     }
 
+  // Handle the special case where the first element of the tree is
+  // non-selectable.
+  if(selected == begin && !selected->get_selectable())
+    {
+      while(selected != end && !selected->get_selectable())
+	++selected;
+
+      if(line_of(selected) >= height)
+	selected = begin;
+    }
+
   if(selected!=end)
     selected->highlighted(this);