Merge commit 'd0fddc1135d0f4acbf439b0a703c3f0e7db05f84' into release

jgraph · Nov 26, 2024 · 9c10ae1 · 9c10ae1
2 parents d1bb63c + d0fddc1
commit 9c10ae1
Show file tree

Hide file tree

Showing 4 changed files with 398 additions and 394 deletions.
diff --git a/drawio b/drawio
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "@electron/fuses": "^1.8.0",
     "@electron/notarize": "^2.4.0",
     "dotenv": "^16.4.5",
-    "electron": "32.0.1",
+    "electron": "^32.0.1",
     "electron-builder": "^24.9.1",
     "sumchecker": "^3.0.1"
   }

diff --git a/src/main/electron.js b/src/main/electron.js
@@ -1759,8 +1759,15 @@ function exportDiagram(event, args, directFinalize)
 					{
 						pdfOptions = {
 							scaleFactor: args.pageScale,
-							preferCSSPageSize: true,
-							printBackground: true
+							printBackground: true,
+							pageSize : {
+								width: args.pageWidth * MICRON_TO_PIXEL,
+								//This height adjustment fixes the output. TODO Test more cases
+								height: (args.pageHeight * 1.025) * MICRON_TO_PIXEL
+							},
+							margins: {
+								marginType: 'none' // no margin
+							}
 						};
 
 						contents.print(pdfOptions, (success, errorType) =>