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

Bug

Browse Source 
- ColDescription::measure did not correctly account for annotation size.
- The macro 'max' was used with expensive arguments, which get evaluated
  twice.
This commit is contained in:
Paul Beckingham
2011-05-08 15:15:48 -04:00
parent 001769997d
commit 949e702c98
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/columns/ColDescription.cpp
View File

@@ -55,7 +55,7 @@ void ColumnDescription::measure (Task& task, int& minimum, int& maximum)
std::string description = task.get ("description"); std::string description = task.get ("description");
// The text // The text
// <date> <anno> // <indent> <date> <anno>
// ... // ...
if (_style == "default") if (_style == "default")
{ {
@@ -64,16 +64,20 @@ void ColumnDescription::measure (Task& task, int& minimum, int& maximum)
if (format == "") if (format == "")
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
minimum = Date::length (format); int min_desc = longestWord (description);
minimum = longestWord (description); int min_anno = indent + Date::length (format);
minimum = max (min_desc, min_anno);
maximum = description.length (); maximum = description.length ();
std::vector <Att> annos; std::vector <Att> annos;
task.getAnnotations (annos); task.getAnnotations (annos);
std::vector <Att>::iterator i; std::vector <Att>::iterator i;
for (i = annos.begin (); i != annos.end (); i++) for (i = annos.begin (); i != annos.end (); i++)
if (indent + i->value ().length () + minimum + 1 > maximum) {
maximum = indent + i->value ().length () + minimum + 1; int len = min_anno + 1 + i->value ().length ();
if (len > maximum)
maximum = len;
}
} }
// Just the text // Just the text
@@ -90,7 +94,9 @@ void ColumnDescription::measure (Task& task, int& minimum, int& maximum)
if (format == "") if (format == "")
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
minimum = max (Date::length (format), longestWord (description)); int min_desc = longestWord (description);
int min_anno = Date::length (format);
minimum = max (min_desc, min_anno);
maximum = description.length (); maximum = description.length ();
std::vector <Att> annos; std::vector <Att> annos;