Merge pull request #1714 from 6uliver/0.1

Add linear gradient to ellipse
bpampuch · May 4, 2019 · e9fd05d · e9fd05d
2 parents 1aab12a + 0f88949
commit e9fd05d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/examples/vectors.js b/examples/vectors.js
@@ -106,7 +106,13 @@ var docDefinition = {
 					type: 'rect',
 					x: 10, y: 230, w: 100, h: 10,
 					linearGradient: ['red', 'yellow', 'green', 'blue']
-				}
+				},
+				{
+					type: 'ellipse',
+					x: 260, y: 140,
+					r1: 30, r2: 20,
+					linearGradient: ['red', 'green', 'blue', 'red'],
+				},
 			]
 		},
 		'This text should be rendered under canvas',

diff --git a/src/printer.js b/src/printer.js
@@ -502,9 +502,15 @@ function renderVector(vector, pdfKitDoc) {
 
 	//TODO: clipping
 
+	var gradient = null;
+
 	switch (vector.type) {
 		case 'ellipse':
 			pdfKitDoc.ellipse(vector.x, vector.y, vector.r1, vector.r2);
+
+			if (vector.linearGradient) {
+				gradient = pdfKitDoc.linearGradient(vector.x - vector.r1, vector.y, vector.x + vector.r1, vector.y);
+			}
 			break;
 		case 'rect':
 			if (vector.r) {
@@ -514,14 +520,7 @@ function renderVector(vector, pdfKitDoc) {
 			}
 
 			if (vector.linearGradient) {
-				var gradient = pdfKitDoc.linearGradient(vector.x, vector.y, vector.x + vector.w, vector.y);
-				var step = 1 / (vector.linearGradient.length - 1);
-
-				for (var i = 0; i < vector.linearGradient.length; i++) {
-					gradient.stop(i * step, vector.linearGradient[i]);
-				}
-
-				vector.color = gradient;
+				gradient = pdfKitDoc.linearGradient(vector.x, vector.y, vector.x + vector.w, vector.y);
 			}
 			break;
 		case 'line':
@@ -552,6 +551,16 @@ function renderVector(vector, pdfKitDoc) {
 			break;
 	}
 
+	if (vector.linearGradient && gradient) {
+		var step = 1 / (vector.linearGradient.length - 1);
+
+		for (var i = 0; i < vector.linearGradient.length; i++) {
+			gradient.stop(i * step, vector.linearGradient[i]);
+		}
+
+		vector.color = gradient;
+	}
+
 	if (vector.color && vector.lineColor) {
 		pdfKitDoc.fillColor(vector.color, vector.fillOpacity || 1);
 		pdfKitDoc.strokeColor(vector.lineColor, vector.strokeOpacity || 1);