- Corrected some cases where rc.color was not obeyed.
This commit is contained in:
Paul Beckingham 2011-05-21 11:29:34 -04:00
parent df652d2ec7
commit 409fa216b8
3 changed files with 41 additions and 19 deletions

View file

@ -26,11 +26,14 @@
////////////////////////////////////////////////////////////////////////////////
#include <ViewTask.h>
#include <Context.h>
#include <Timer.h>
#include <text.h>
#include <utf8.h>
#include <main.h>
extern Context context;
////////////////////////////////////////////////////////////////////////////////
ViewTask::ViewTask ()
: _width (0)
@ -204,10 +207,10 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
std::string extra = std::string (_extra_padding, ' ');
std::string intra = std::string (_intra_padding, ' ');
std::string extra_odd = _extra_odd.colorize (extra);
std::string extra_even = _extra_even.colorize (extra);
std::string intra_odd = _intra_odd.colorize (intra);
std::string intra_even = _intra_even.colorize (intra);
std::string extra_odd = context.color () ? _extra_odd.colorize (extra) : extra;
std::string extra_even = context.color () ? _extra_even.colorize (extra) : extra;
std::string intra_odd = context.color () ? _intra_odd.colorize (intra) : intra;
std::string intra_even = context.color () ? _intra_even.colorize (intra) : intra;
for (int i = 0; i < max_lines; ++i)
{
@ -249,8 +252,12 @@ std::string ViewTask::render (std::vector <Task>& data, std::vector <int>& seque
// Alternate rows based on |s % 2|
bool odd = (s % 2) ? true : false;
Color row_color = odd ? _odd : _even;
row_color.blend (rule_color);
Color row_color;
if (context.color ())
{
row_color = odd ? _odd : _even;
row_color.blend (rule_color);
}
for (int c = 0; c < _columns.size (); ++c)
{