GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Palette: Defaults now applied only on demand

Browse source
This commit is contained in:
Paul Beckingham 2016-04-22 23:36:56 -04:00
parent 8befd604bb
commit b5ec5d2440
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/Palette.cpp
View file

@ -40,28 +40,33 @@ void Palette::initialize (const Rules& rules)
////////////////////////////////////////////////////////////////////////////////
Color Palette::next ()
{
// If there are no colors, then ::initialize was not provided with any, so use
// a default set.
if (! _colors.size ())
_colors = {
Color ("white on red"),
Color ("white on blue"),
Color ("white on green"),
Color ("black on magenta"),
Color ("black on cyan"),
Color ("black on yellow"),
Color ("black on white"),
Color ("white on bright red"),
Color ("white on bright blue"),
Color ("white on bright green"),
Color ("black on bright magenta"),
Color ("black on bright cyan"),
Color ("black on bright yellow"),
};
// Return the next color in the list. Cycle to the beginning if necessary.
return _colors[_current++ % _colors.size ()];
}
////////////////////////////////////////////////////////////////////////////////
void Palette::defaults ()
int Palette::size () const
{
_colors =
{
Color ("white on red"),
Color ("white on blue"),
Color ("black on green"),
Color ("black on magenta"),
Color ("black on cyan"),
Color ("black on yellow"),
Color ("black on white"),
Color ("white on bright red"),
Color ("white on bright blue"),
Color ("black on bright green"),
Color ("black on bright magenta"),
Color ("black on bright cyan"),
Color ("black on bright yellow"),
};
return static_cast <int> (_colors.size ());
}
////////////////////////////////////////////////////////////////////////////////

4
src/Palette.h
View file

@ -38,9 +38,7 @@ public:
Palette () = default;
void initialize (const Rules&);
Color next ();
private:
void defaults ();
int size () const;
private:
std::vector <Color> _colors {};