mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
Columns: Removed _fixed_width for indicator columns
- Column indicator formats (depends.indicator, for example), should not set the ::_fixed_width flag because then the column does not have the opportunity to be suppressed via rc.print.empty.colums=1.
This commit is contained in:
parent
31ff9d476e
commit
e930bb0ba9
6 changed files with 29 additions and 19 deletions
|
@ -83,8 +83,10 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
|
|||
|
||||
if (_style == "indicator")
|
||||
{
|
||||
if (task.has ("depends"))
|
||||
minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
|
||||
_fixed_width = true;
|
||||
else
|
||||
minimum = maximum = 0;
|
||||
}
|
||||
else if (_style == "count")
|
||||
{
|
||||
|
|
|
@ -86,8 +86,10 @@ void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maxi
|
|||
}
|
||||
else if (_style == "indicator")
|
||||
{
|
||||
if (task.has ("recur"))
|
||||
minimum = maximum = utf8_width (context.config.get ("recurrence.indicator"));
|
||||
_fixed_width = true;
|
||||
else
|
||||
minimum = maximum = 0;
|
||||
}
|
||||
else
|
||||
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
|
||||
|
|
|
@ -74,8 +74,10 @@ void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maxi
|
|||
{
|
||||
if (_style == "active")
|
||||
{
|
||||
if (task.has ("start"))
|
||||
minimum = maximum = utf8_width (context.config.get ("active.indicator"));
|
||||
_fixed_width = true;
|
||||
else
|
||||
minimum = maximum = 0;
|
||||
}
|
||||
else
|
||||
ColumnDate::measure (task, minimum, maximum);
|
||||
|
|
|
@ -85,8 +85,10 @@ void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maxim
|
|||
{
|
||||
if (_style == "indicator")
|
||||
{
|
||||
if (task.has ("tags"))
|
||||
minimum = maximum = utf8_width (context.config.get ("tag.indicator"));
|
||||
_fixed_width = true;
|
||||
else
|
||||
minimum = maximum = 0;
|
||||
}
|
||||
else if (_style == "count")
|
||||
{
|
||||
|
|
|
@ -116,8 +116,10 @@ void ColumnUDA::measure (Task& task, unsigned int& minimum, unsigned int& maximu
|
|||
}
|
||||
else if (_style == "indicator")
|
||||
{
|
||||
if (task.has (_name))
|
||||
minimum = maximum = utf8_width (context.config.get ("uda." + _name + ".indicator"));
|
||||
_fixed_width = true;
|
||||
else
|
||||
minimum = maximum = 0;
|
||||
}
|
||||
else
|
||||
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue