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

ColDepends: Removed redundant code

Browse source
This commit is contained in:
Paul Beckingham 2016-12-31 11:45:31 -05:00
parent 7a4d99f954
commit c81c9f5b58
1 changed files with 42 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/columns/ColDepends.cpp
View file

@ -68,26 +68,28 @@ void ColumnDepends::setStyle (const std::string& value)
// Set the minimum and maximum widths for the value. // Set the minimum and maximum widths for the value.
void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
std::vector <Task> blocking; minimum = maximum = 0;
dependencyGetBlocking (task, blocking); if (task.has (_name))
if (_style == "indicator")
{ {
if (task.has (_name)) if (_style == "indicator")
minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
else
minimum = maximum = 0;
}
else if (_style == "count")
{
minimum = maximum = 2 + format ((int) blocking.size ()).length ();
}
else if (_style == "default" ||
_style == "list")
{
minimum = maximum = 0;
if (task.has (_name))
{ {
minimum = maximum = utf8_width (context.config.get ("dependency.indicator"));
}
else if (_style == "count")
{
std::vector <Task> blocking;
dependencyGetBlocking (task, blocking);
minimum = maximum = 2 + format ((int) blocking.size ()).length ();
}
else if (_style == "default" ||
_style == "list")
{
minimum = maximum = 0;
std::vector <Task> blocking;
dependencyGetBlocking (task, blocking);
std::vector <int> blocking_ids; std::vector <int> blocking_ids;
for (auto& i : blocking) for (auto& i : blocking)
blocking_ids.push_back (i.id); blocking_ids.push_back (i.id);
@ -103,9 +105,9 @@ void ColumnDepends::measure (Task& task, unsigned int& minimum, unsigned int& ma
minimum = length; minimum = length;
} }
} }
else
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
} }
else
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -118,30 +120,35 @@ void ColumnDepends::render (
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "indicator") if (_style == "indicator")
{
renderStringRight (lines, width, color, context.config.get ("dependency.indicator")); renderStringRight (lines, width, color, context.config.get ("dependency.indicator"));
else }
else if (_style == "count")
{ {
std::vector <Task> blocking; std::vector <Task> blocking;
dependencyGetBlocking (task, blocking); dependencyGetBlocking (task, blocking);
if (_style == "count") renderStringRight (lines, width, color, '[' + format (static_cast <int>(blocking.size ())) + ']');
renderStringRight (lines, width, color, '[' + format (static_cast <int>(blocking.size ())) + ']'); }
else if (_style == "default" || else if (_style == "default" ||
_style == "list") _style == "list")
{ {
std::vector <int> blocking_ids; std::vector <Task> blocking;
for (const auto& t : blocking) dependencyGetBlocking (task, blocking);
blocking_ids.push_back (t.id);
auto combined = join (" ", blocking_ids); std::vector <int> blocking_ids;
for (const auto& t : blocking)
blocking_ids.push_back (t.id);
std::vector <std::string> all; auto combined = join (" ", blocking_ids);
wrapText (all, combined, width, _hyphenate);
for (const auto& i : all) std::vector <std::string> all;
renderStringLeft (lines, width, color, i); wrapText (all, combined, width, _hyphenate);
}
for (const auto& i : all)
renderStringLeft (lines, width, color, i);
} }
} }
} }