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

Bug Fix - #371 color.due clobbered by color.alternate

Browse Source 
- Fixed bug #371 which caused task to mis-apply certain color rules, like
  color.alternate, which was (a) not applied first, and (b) not blended
  with the other color rules (thanks to Richard Querin).
This commit is contained in:
Paul Beckingham
2010-02-06 12:22:20 -05:00
parent 58910b07ef
commit 2b2795077b
3 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Table.h
View File

@@ -57,7 +57,8 @@ public:
Table (const Table&);
Table& operator= (const Table&);
void setTableColor (const Color&);
// TODO Obsolete - this is not used. Consider removal.
// void setTableColor (const Color&);
void setTableAlternateColor (const Color&);
void setTablePadding (int);
void setTableIntraPadding (int);
@@ -65,7 +66,8 @@ public:
void setTableDashedUnderline ();
int addColumn (const std::string&);
void setColumnColor (int, const Color&);
// TODO Obsolete - this is not used. Consider removal.
// void setColumnColor (int, const Color&);
void setColumnUnderline (int);
void setColumnPadding (int, int);
void setColumnWidth (int, int);
@@ -94,7 +96,7 @@ public:
private:
std::string getCell (const int, const int);
Color getColor (const int, const int);
Color getColor (const int, const int, const int);
Color getHeaderColor (const int);
Color getHeaderUnderline (const int);
int getPadding (const int);
@@ -104,7 +106,7 @@ private:
just getHeaderJustification (const int);
const std::string formatHeader (const int, const int, const int);
const std::string formatHeaderDashedUnderline (const int, const int, const int);
void formatCell (const int, const int, const int, const int, std::vector <std::string>&, std::string&);
void formatCell (const int, const int, const int, const int, const int, std::vector <std::string>&, std::string&);
void sort (std::vector <int>&);
void clean (std::string&);
void optimize (std::string&) const;
@@ -116,6 +118,7 @@ private:
std::map <std::string, Color> mColor;
std::map <std::string, Color> mUnderline;
bool mDashedUnderline;
Color alternate;
// Padding...
int mTablePadding;