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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 21:09:18 2005
New Revision: 3332

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/config/style.h
Log:
Handle color overwriting in style application.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 21:09:18 2005
@@ -1,5 +1,12 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* 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
+	nontransparent colors to overwrite the existing colors).
+
 	* src/vscreen/vscreen_widget.cc:
 
 	Initialize pre_display_erase to 'true' in the constructor.

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:09:18 2005
@@ -70,12 +70,12 @@
   /** Set the foreground color.  There is no change if the
    *  new foreground color is "empty".
    */
-  void set_fg(short _fg) {if(fg>=0) fg=_fg;}
+  void set_fg(short _fg) {if(_fg>=0) fg=_fg;}
 
   /** Set the background color.  There is no change if the
    *  new background color is "empty".
    */
-  void set_bg(short _bg) {if(bg>=0) bg=_bg;}
+  void set_bg(short _bg) {if(_bg>=0) bg=_bg;}
 
   /** Set the given attribute(s). */
   void attrs_on(attr_t attrs)