gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Code Cleanup

Browse Source 
- Made the Color::blend code structure match that in vitapi, for
  easier comparison.
This commit is contained in:
Paul Beckingham
2010-07-23 22:47:51 -07:00
parent eeeff7d389
commit 6f67c0093d
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Color.cpp
View File

@@ -349,24 +349,26 @@ void Color::blend (const Color& other)
return; return;
} }
else
// Upgrade either color, if necessary.
if (!(value & _COLOR_256)) upgrade ();
if (!(c.value & _COLOR_256)) c.upgrade ();
// 256 <-- 256.
if (c.value & _COLOR_HASFG)
{ {
value |= _COLOR_HASFG; // There is now a color. // Upgrade either color, if necessary.
value &= ~_COLOR_FG; // Remove previous color. if (!(value & _COLOR_256)) upgrade ();
value |= (c.value & _COLOR_FG); // Apply other color. if (!(c.value & _COLOR_256)) c.upgrade ();
}
if (c.value & _COLOR_HASBG) // 256 <-- 256.
{ if (c.value & _COLOR_HASFG)
value |= _COLOR_HASBG; // There is now a color. {
value &= ~_COLOR_BG; // Remove previous color. value |= _COLOR_HASFG; // There is now a color.
value |= (c.value & _COLOR_BG); // Apply other color. value &= ~_COLOR_FG; // Remove previous color.
value |= (c.value & _COLOR_FG); // Apply other color.
}
if (c.value & _COLOR_HASBG)
{
value |= _COLOR_HASBG; // There is now a color.
value &= ~_COLOR_BG; // Remove previous color.
value |= (c.value & _COLOR_BG); // Apply other color.
}
} }
} }