Patching cover page for 0mm margins

Patching cover page for 0mm margins. Original modification from andkorsh@c09862d altered following this comment : wkhtmltopdf#3692 (comment)
stncrn · Feb 2, 2018 · 55230ca · 55230ca
1 parent cf10883
commit 55230ca
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/include/wkhtmltox/pdfsettings.hh b/include/wkhtmltox/pdfsettings.hh
@@ -202,6 +202,8 @@ struct DLL_PUBLIC PdfObject {
 
 	bool isTableOfContent;
 
+	bool isCover;
+
 	QString tocXsl;
 
 	QString get(const char * name);

diff --git a/src/lib/pdfconverter.cc b/src/lib/pdfconverter.cc
@@ -991,10 +991,24 @@ void PdfConverterPrivate::printDocument() {
 	progressString = "Preparing";
 	emit out.progressChanged(0);
 
+	qreal leftMargin, topMargin, rightMargin, bottomMargin;
+	printer->getPageMargins(&leftMargin, &topMargin, &rightMargin, &bottomMargin, settings.margin.left.second);
+
 	for (int cc_=0; cc_ < cc; ++cc_) {
 		pageNumber=1;
 		for (int d=0; d < objects.size(); ++d) {
+			if (objects[d].settings.isCover) {
+				painter->save();
+				painter->translate(-leftMargin * printer->width() / printer->widthMM(), -topMargin * printer->height() / printer->heightMM());
+				printer->setPageMargins(0, 0, 0, 0, settings.margin.left.second);
+			}
 			beginPrintObject(objects[d]);
+
+			if (objects[d].settings.isCover) {
+				printer->setPageMargins(leftMargin, topMargin, rightMargin, bottomMargin, settings.margin.left.second);
+				painter->restore();
+			}
+
 			// XXX: In some cases nothing gets loaded at all,
 			//      so we would get no webPrinter instance.
 			int pageCount = webPrinter != 0 ? webPrinter->pageCount() : 0;

diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc
@@ -162,6 +162,7 @@ struct DLL_LOCAL ReflectImpl<PdfObject>: public ReflectClass {
 		WKHTMLTOPDF_REFLECT(includeInOutline);
 		WKHTMLTOPDF_REFLECT(pagesCount);
 		WKHTMLTOPDF_REFLECT(isTableOfContent);
+		WKHTMLTOPDF_REFLECT(isCover);
 		WKHTMLTOPDF_REFLECT(tocXsl);
 	}
 };
@@ -405,6 +406,7 @@ PdfObject::PdfObject():
 	includeInOutline(true),
 	pagesCount(true),
 	isTableOfContent(false),
+	isCover(false),
 	tocXsl("") {};
 
 QString PdfGlobal::get(const char * name) {

diff --git a/src/lib/pdfsettings.hh b/src/lib/pdfsettings.hh
@@ -202,6 +202,8 @@ struct DLL_PUBLIC PdfObject {
 
 	bool isTableOfContent;
 
+	bool isCover;
+
 	QString tocXsl;
 
 	QString get(const char * name);

diff --git a/src/pdf/pdfcommandlineparser.cc b/src/pdf/pdfcommandlineparser.cc
@@ -178,6 +178,7 @@ void PdfCommandLineParser::parseArguments(int argc, const char ** argv, bool fro
 			ps.header.line = ps.footer.line = false;
 			ps.header.htmlUrl = ps.footer.htmlUrl = "";
 			ps.includeInOutline = false;
+			ps.isCover = true;
 
 			continue;
 		} else if (!strcmp(argv[arg],"toc")) {