mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: webContents.printToPDF option plumbing (#35975)

Browse source 
fix: contents.printToPDF option plumbing
This commit is contained in:
Shelley Vohr 2022-10-11 16:06:34 -07:00 committed by GitHub
parent 0759f3320e
commit ee7cf5a6d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/browser/api/web-contents.ts
View file

@ -174,13 +174,13 @@ WebContents.prototype.printToPDF = async function (options) {
headerTemplate: '', headerTemplate: '',
footerTemplate: '', footerTemplate: '',
printBackground: false, printBackground: false,
scale: 1, scale: 1.0,
paperWidth: 8.5, paperWidth: 8.5,
paperHeight: 11, paperHeight: 11.0,
marginTop: 0, marginTop: 0.0,
marginBottom: 0, marginBottom: 0.0,
marginLeft: 0, marginLeft: 0.0,
marginRight: 0, marginRight: 0.0,
pageRanges: '', pageRanges: '',
preferCSSPageSize: false preferCSSPageSize: false
}; };
@ -210,7 +210,7 @@ WebContents.prototype.printToPDF = async function (options) {
if (typeof options.scale !== 'number') { if (typeof options.scale !== 'number') {
return Promise.reject(new Error('scale must be a Number')); return Promise.reject(new Error('scale must be a Number'));
} }
printSettings.scaleFactor = options.scale; printSettings.scale = options.scale;
} }
const { pageSize } = options; const { pageSize } = options;

12
shell/browser/api/electron_api_web_contents.cc
View file

@ -2857,12 +2857,12 @@ v8::Local<v8::Promise> WebContents::PrintToPDF(const base::Value& settings) {
settings.GetDict().FindBool("displayHeaderFooter"); settings.GetDict().FindBool("displayHeaderFooter");
auto print_background = settings.GetDict().FindBool("shouldPrintBackgrounds"); auto print_background = settings.GetDict().FindBool("shouldPrintBackgrounds");
auto scale = settings.GetDict().FindDouble("scale"); auto scale = settings.GetDict().FindDouble("scale");
auto paper_width = settings.GetDict().FindInt("paperWidth"); auto paper_width = settings.GetDict().FindDouble("paperWidth");
auto paper_height = settings.GetDict().FindInt("paperHeight"); auto paper_height = settings.GetDict().FindDouble("paperHeight");
auto margin_top = settings.GetDict().FindIntByDottedPath("margins.top"); auto margin_top = settings.GetDict().FindDouble("marginTop");
auto margin_bottom = settings.GetDict().FindIntByDottedPath("margins.bottom"); auto margin_bottom = settings.GetDict().FindDouble("marginBottom");
auto margin_left = settings.GetDict().FindIntByDottedPath("margins.left"); auto margin_left = settings.GetDict().FindDouble("marginLeft");
auto margin_right = settings.GetDict().FindIntByDottedPath("margins.right"); auto margin_right = settings.GetDict().FindDouble("marginRight");
auto page_ranges = *settings.GetDict().FindString("pageRanges"); auto page_ranges = *settings.GetDict().FindString("pageRanges");
auto header_template = *settings.GetDict().FindString("headerTemplate"); auto header_template = *settings.GetDict().FindString("headerTemplate");
auto footer_template = *settings.GetDict().FindString("footerTemplate"); auto footer_template = *settings.GetDict().FindString("footerTemplate");