GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-22 11:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code Cleanup

Browse source 
- Check systematically if the color is non-trivial before blending.
This commit is contained in:
Louis-Claude Canon 2012-05-27 12:03:19 +02:00 • committed by Paul Beckingham
parent f2f6b788e8
commit 90c420263c
3 changed files with 45 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Color.cpp
View file

@ -348,6 +348,9 @@ Color::operator int () const
void Color::blend (const Color& other)
{
#ifdef FEATURE_COLOR
if (!other.nontrivial ())
return;
Color c (other);
_value |= (c._value & _COLOR_UNDERLINE); // Always inherit underline.
_value |= (c._value & _COLOR_INVERSE); // Always inherit inverse.
@ -443,7 +446,7 @@ void Color::upgrade ()
std::string Color::colorize (const std::string& input)
{
#ifdef FEATURE_COLOR
if (_value == 0)
if (!nontrivial ())
return input;
int count = 0;
@ -486,7 +489,7 @@ std::string Color::colorize (const std::string& input)
}
// 16 color
if (_value != 0)
else
{
result << "\033[";
@ -570,7 +573,7 @@ std::string Color::colorize (const std::string& input, const std::string& spec)
}
////////////////////////////////////////////////////////////////////////////////
bool Color::nontrivial ()
bool Color::nontrivial () const
{
return _value != 0 ? true : false;
}