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

Merge branch '2.3.0' into 2.4.0

Browse source
This commit is contained in:
Paul Beckingham 2014-01-08 00:10:17 -05:00
commit 1ac4ff8ac9
6 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/columns/ColDepends.cpp
View file

@ -30,6 +30,7 @@
#include <Context.h>
#include <ColDepends.h>
#include <text.h>
#include <utf8.h>
#include <i18n.h>
#include <main.h>
@ -83,7 +84,7 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
std::vector <Task> blocking;
dependencyGetBlocking (task, blocking);
if (_style == "indicator") minimum = maximum = context.config.get ("dependency.indicator").length ();
if (_style == "indicator") minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
else if (_style == "count") minimum = maximum = 2 + format ((int) blocking.size ()).length ();
else if (_style == "default" ||
_style == "list")

3
src/columns/ColRecur.cpp
View file

@ -30,6 +30,7 @@
#include <OldDuration.h>
#include <ColRecur.h>
#include <text.h>
#include <utf8.h>
#include <i18n.h>
extern Context context;
@ -87,7 +88,7 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
else if (_style == "indicator")
{
if (task.has (_name))
minimum = maximum = context.config.get ("recurrence.indicator").length ();
minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
}
else
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);

3
src/columns/ColStart.cpp
View file

@ -29,6 +29,7 @@
#include <Context.h>
#include <ColStart.h>
#include <text.h>
#include <utf8.h>
#include <i18n.h>
extern Context context;
@ -77,7 +78,7 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
if (_style == "active")
{
if (! task.has ("end"))
minimum = maximum = context.config.get ("active.indicator").length ();
minimum = maximum = utf8_width (context.config.get ("active.indicator"));
}
else
ColumnDate::measure (task, minimum, maximum);