fixed font size calculation for watermark if is page orientation is c…

…hanged
bpampuch · Nov 23, 2024 · 13dcebd · 13dcebd
1 parent e04c087
commit 13dcebd
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed aspect ratio for image with exif orientation tag
+- Fixed font size calculation for watermark if is page orientation is changed
 
 ## 0.2.15 - 2024-11-02
 

diff --git a/src/layoutBuilder.js b/src/layoutBuilder.js
@@ -252,36 +252,40 @@ LayoutBuilder.prototype.addWatermark = function (watermark, fontProvider, defaul
 		return;
 	}
 
-	watermark.font = watermark.font || defaultStyle.font || 'Roboto';
-	watermark.fontSize = watermark.fontSize || 'auto';
-	watermark.color = watermark.color || 'black';
-	watermark.opacity = isNumber(watermark.opacity) ? watermark.opacity : 0.6;
-	watermark.bold = watermark.bold || false;
-	watermark.italics = watermark.italics || false;
-	watermark.angle = !isUndefined(watermark.angle) && !isNull(watermark.angle) ? watermark.angle : null;
-
-	if (watermark.angle === null) {
-		watermark.angle = Math.atan2(this.pageSize.height, this.pageSize.width) * -180 / Math.PI;
+	var pages = this.writer.context().pages;
+	for (var i = 0, l = pages.length; i < l; i++) {
+		pages[i].watermark = getWatermarkObject({ ...watermark }, pages[i].pageSize, fontProvider, defaultStyle);
 	}
 
-	if (watermark.fontSize === 'auto') {
-		watermark.fontSize = getWatermarkFontSize(this.pageSize, watermark, fontProvider);
-	}
+	function getWatermarkObject(watermark, pageSize, fontProvider, defaultStyle) {
+		watermark.font = watermark.font || defaultStyle.font || 'Roboto';
+		watermark.fontSize = watermark.fontSize || 'auto';
+		watermark.color = watermark.color || 'black';
+		watermark.opacity = isNumber(watermark.opacity) ? watermark.opacity : 0.6;
+		watermark.bold = watermark.bold || false;
+		watermark.italics = watermark.italics || false;
+		watermark.angle = !isUndefined(watermark.angle) && !isNull(watermark.angle) ? watermark.angle : null;
+
+		if (watermark.angle === null) {
+			watermark.angle = Math.atan2(pageSize.height, pageSize.width) * -180 / Math.PI;
+		}
 
-	var watermarkObject = {
-		text: watermark.text,
-		font: fontProvider.provideFont(watermark.font, watermark.bold, watermark.italics),
-		fontSize: watermark.fontSize,
-		color: watermark.color,
-		opacity: watermark.opacity,
-		angle: watermark.angle
-	};
+		if (watermark.fontSize === 'auto') {
+			watermark.fontSize = getWatermarkFontSize(pageSize, watermark, fontProvider);
+		}
 
-	watermarkObject._size = getWatermarkSize(watermark, fontProvider);
+		var watermarkObject = {
+			text: watermark.text,
+			font: fontProvider.provideFont(watermark.font, watermark.bold, watermark.italics),
+			fontSize: watermark.fontSize,
+			color: watermark.color,
+			opacity: watermark.opacity,
+			angle: watermark.angle
+		};
 
-	var pages = this.writer.context().pages;
-	for (var i = 0, l = pages.length; i < l; i++) {
-		pages[i].watermark = watermarkObject;
+		watermarkObject._size = getWatermarkSize(watermark, fontProvider);
+
+		return watermarkObject;
 	}
 
 	function getWatermarkSize(watermark, fontProvider) {