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

[Daniel Burrows]

Author: dburrows
Date: Tue Aug  9 21:28:35 2005
New Revision: 3792

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc
Log:
Include highlight status in the style passed to vs_treeitem::paint().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug  9 21:28:35 2005
@@ -1,5 +1,10 @@
 2005-08-09  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_tree.cc:
+
+	  Include the highlight status in the style passed to
+	  vs_treeitem::paint().
+
 	* src/solution_screen.cc:
 
 	  Write a specialized treeitem class to represent the elements of

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	Tue Aug  9 21:28:35 2005
@@ -808,12 +808,15 @@
     {
       vs_treeitem *curr=&*i;
 
+      style curr_st;
+
       if(get_isfocussed() && i==selected && i->get_selectable())
-	apply_style(st+curr->get_highlight_style());
+	curr_st = st+curr->get_highlight_style();
       else
-	apply_style(st+curr->get_normal_style());
+	curr_st = st+curr->get_normal_style();
 
-      curr->paint(this, y, hierarchical, st);
+      apply_style(curr_st);
+      curr->paint(this, y, hierarchical, curr_st);
 
       if(hierarchical)
 	++i;