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

[Daniel Burrows]

Author: dburrows
Date: Fri May 27 02:34:55 2005
New Revision: 3290

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/config/style.h
Log:
Take color data into account when generating attrs.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri May 27 02:34:55 2005
@@ -1,3 +1,10 @@
+2005-05-26  Daniel Burrows  <dburrows@debian.org>
+
+	* src/vscreen/config/style.h:
+
+	Take the color data into account when generating attrs from a
+	style.
+
 2005-05-26  Christian Perrier  <bubulle@debian.org>
 
 	* po/fr.po: Typo corrections from sarge branch

Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/style.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/style.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/style.h	Fri May 27 02:34:55 2005
@@ -153,6 +153,7 @@
     rval|=set_attrs;
     rval&=~clear_attrs;
     rval^=flip_attrs;
+    rval|=COLOR_PAIR(mix_color(0, fg, bg));
     return rval;
   }