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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 21:30:33 2005
New Revision: 3333

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/config/style.h
Log:
Further fixes to style composition: include information from both
styles, not just the last one in the list.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 21:30:33 2005
@@ -2,6 +2,11 @@
 
 	* src/vscreen/config/style.h:
 
+	Fix the composition of styles by including information from both
+	styles, not just the last one (doh).
+
+	* src/vscreen/config/style.h:
+
 	Fix part of the problem with compositing styles: previously,
 	colors only got overwritten if they were *currently*
 	nontransparent (correct behavior would be to only use

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	Mon Jun  6 21:30:33 2005
@@ -116,8 +116,8 @@
    */
   style operator+(const style &other) const
   {
-    style rval;
-    rval.apply_style(other);
+    style rval(*this);
+    rval+=other;
     return rval;
   }