Commit 97bf4b95 authored by Glen Ditchfield's avatar Glen Ditchfield 🐛
Browse files

Merge branch 'release/21.04'

parents 5808246d 6f97d180
Pipeline #66379 passed with stage
in 5 minutes and 45 seconds
......@@ -1175,7 +1175,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
drawTimeTable(p, fromWeek, endLeft, false, mStartTime, mEndTime, weekBox, mIncludeDescription,
mIncludeCategories, mExcludeTime, mExcludeConfidential, mExcludePrivate);
if (mPrintFooter) {
drawFooter(p, weekBox1);
drawFooter(p, footerBox);
}
mPrinter->newPage();
drawSplitHeaderRight(p, fromWeek, curWeek, QDate(), width, hh);
......
......@@ -2226,7 +2226,7 @@ void CalPrintPluginBase::drawSplitHeaderRight(QPainter &p, QDate fd, QDate td, Q
}
title += QString::number(fd.year());
p.drawText(0, lineSpacing, width, lineSpacing, Qt::AlignRight | Qt::AlignTop, title);
p.drawText(0, lineSpacing + padding(), width, lineSpacing, Qt::AlignRight | Qt::AlignTop, title);
p.setFont(oldFont);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment