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

Bug #1476

Browse source 
- #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
This commit is contained in:
Paul Beckingham 2014-01-07 22:23:39 -05:00
parent c4ecf613ac
commit 3e4972ba4b
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -95,6 +95,7 @@ Bugs
+ #1414 Client does not verify SSL certificates (thanks to Scott Kroll). + #1414 Client does not verify SSL certificates (thanks to Scott Kroll).
+ #1415 Client should not require a SSL certificate if the server has a trusted + #1415 Client should not require a SSL certificate if the server has a trusted
certificate (thanks to Scott Kroll). certificate (thanks to Scott Kroll).
+ #1476 Unicode indicators increase column width (thanks to Paul Kishimoto).
+ Fixed bug so that 'limit:page' now considers footnote messages. + Fixed bug so that 'limit:page' now considers footnote messages.
+ Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks + Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks
(thanks to greenskeleton). (thanks to greenskeleton).

3
src/columns/ColDepends.cpp
View file

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

3
src/columns/ColRecur.cpp
View file

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

3
src/columns/ColStart.cpp
View file

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