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

Use fields directly instead of via parameters to calculate indent size

Browse source
This commit is contained in:
Thomas Lauf 2019-01-30 18:34:54 +01:00
parent c7b7b483ba
commit cf88f1585a
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Chart.cpp
View file

@ -82,7 +82,7 @@ std::string Chart::render (
const auto chars_per_hour = 60 / minutes_per_char;
const auto cell_size = chars_per_hour + spacing;
const auto indent_size = getIndentSize (with_label_month, with_label_week, with_label_day, with_label_weekday);
const auto indent_size = getIndentSize ();
const auto indent = std::string (indent_size, ' ');
const auto padding_size = indent_size + ((last_hour - first_hour + 1) * (cell_size)) + 1;
@ -176,16 +176,12 @@ std::string Chart::render (
}
////////////////////////////////////////////////////////////////////////////////
unsigned long Chart::getIndentSize (
const bool with_month,
const bool with_week,
const bool with_day,
const bool with_weekday)
unsigned long Chart::getIndentSize ()
{
return (with_month ? 4 : 0) +
(with_week ? 4 : 0) +
(with_day ? 3 : 0) +
(with_weekday ? 4 : 0);
return (with_label_month ? 4 : 0) +
(with_label_week ? 4 : 0) +
(with_label_day ? 3 : 0) +
(with_label_weekday ? 4 : 0);
}
////////////////////////////////////////////////////////////////////////////////

2
src/Chart.h
View file

@ -39,7 +39,7 @@ public:
std::string render (const Interval&, const std::vector <Interval>&, const std::vector <Range>&, const std::map <Datetime, std::string>&, const std::map <std::string, Color>&, const Color&, const Color&, const Color&, const Color&, bool, bool, bool, bool, bool, bool, bool, int, int, int);
private:
unsigned long getIndentSize (bool, bool, bool, bool);
unsigned long getIndentSize ();
std::pair <int, int> determineHourRange (const Interval&, const std::vector <Interval>&);