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

TW-1795: Calendar underline on Day padding

Browse source 
- Thanks to Renato Alves.
This commit is contained in:
Paul Beckingham 2016-04-15 07:55:21 -04:00
parent 7910a3cb5a
commit 1625dd6f10
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -12,6 +12,8 @@
(thanks to Sebastien Badia).
- TW-1792 The info command uses '0' to reference dependencies on non-
pending tasks.
- TW-1795 Calendar underline on Day padding
(thanks to Renato Alves).
- Added 'juhannus' as a synonym for 'midsommarafton'
(thanks to Lynoure Braakman).
- Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'

10
src/commands/CmdCalendar.cpp
View file

@ -440,7 +440,7 @@ std::string CmdCalendar::renderMonths (
{
if (weekStart == 1)
{
view.add (Column::factory ("string.right", " "));
view.add (Column::factory ("string.right", ""));
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2)));
@ -451,7 +451,7 @@ std::string CmdCalendar::renderMonths (
}
else
{
view.add (Column::factory ("string.right", " "));
view.add (Column::factory ("string.right", ""));
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2)));
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2)));
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2)));
@ -516,7 +516,11 @@ std::string CmdCalendar::renderMonths (
int woy = temp.weekOfYear (weekStart);
if (context.config.getBoolean ("displayweeknumber"))
view.set (row, (8 * mpl), woy, color_weeknumber);
view.set (row,
(8 * mpl),
// Make sure the week number is always 4 columns, space-padded.
format ((woy < 10 ? " {1}" : " {1}"), woy),
color_weeknumber);
// Calculate column id.
int thisCol = dow + // 0 = Sunday