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

Bug #1210

Browse source 
- Fixed bug #1210 so that widths are taken from localized strings
  instead of hardcoded.
This commit is contained in:
Scott Kostyshak 2013-03-26 19:17:42 -04:00 • committed by Paul Beckingham
parent e88b52b67d
commit 6c0561cb4d
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -99,6 +99,8 @@ Bugs
for the user's home directory (thanks to Jakub Wilk). for the user's home directory (thanks to Jakub Wilk).
+ Fixed bug #1209, spelling mistake in reference page (thanks to Friedrich + Fixed bug #1209, spelling mistake in reference page (thanks to Friedrich
Heusler). Heusler).
+ Fixed bug #1210 so that widths are taken from localized strings instead of
hardcoded.
+ Improved hyphenation by splitting on commas (even if no whitespace after). + Improved hyphenation by splitting on commas (even if no whitespace after).
Leads to better output of, for example, 'task show', where comma-separated Leads to better output of, for example, 'task show', where comma-separated
lists are common. lists are common.

22
src/columns/ColStatus.cpp
View file

@ -31,6 +31,7 @@
#include <ColStatus.h> #include <ColStatus.h>
#include <text.h> #include <text.h>
#include <i18n.h> #include <i18n.h>
#include <utf8.h>
extern Context context; extern Context context;
@ -80,17 +81,16 @@ void ColumnStatus::measure (Task& task, unsigned int& minimum, unsigned int& max
if (_style == "default" || if (_style == "default" ||
_style == "long") _style == "long")
{ {
if (status == Task::pending || if (status == Task::pending)
status == Task::deleted || minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_PE);
status == Task::waiting) else if (status == Task::deleted)
{ minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_DE);
minimum = maximum = 7; else if (status == Task::waiting)
} minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_WA);
else if (status == Task::completed || else if (status == Task::completed)
status == Task::recurring) minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_CO);
{ else if (status == Task::recurring)
minimum = maximum = 9; minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_RE);
}
} }
else if (_style == "short") else if (_style == "short")
minimum = maximum = 1; minimum = maximum = 1;