gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CmdCalendar: Respect calendar.monthsperline alongside monthsperline

Browse Source
This commit is contained in:
Tomas Babej
2021-09-25 13:15:58 -04:00
parent 898a6d200d
commit c22b233300
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/CmdCalendar.cpp
View File

@@ -64,7 +64,14 @@ int CmdCalendar::execute (std::string& output)
// Each month requires 28 text columns width. See how many will actually // Each month requires 28 text columns width. See how many will actually
// fit. But if a preference is specified, and it fits, use it. // fit. But if a preference is specified, and it fits, use it.
auto width = Context::getContext ().getWidth (); auto width = Context::getContext ().getWidth ();
auto preferredMonthsPerLine = config.getInteger ("monthsperline"); int preferredMonthsPerLine;
if (config.has ("calendar.monthsperline"))
preferredMonthsPerLine = config.getInteger ("calendar.monthsperline");
else
// Legacy configuration variable value
preferredMonthsPerLine = config.getInteger ("monthsperline");
auto monthsThatFit = width / 26; auto monthsThatFit = width / 26;
auto monthsPerLine = monthsThatFit; auto monthsPerLine = monthsThatFit;