Correct calculation of padding in percent (#5846)

chartjs · Nov 21, 2018 · b68341d · b68341d
1 parent bc494e0
commit b68341d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
@@ -499,7 +499,7 @@ module.exports = function() {
 	helpers._calculatePadding = function(container, padding, parentDimension) {
 		padding = helpers.getStyle(container, padding);
 
-		return padding.indexOf('%') > -1 ? parentDimension / parseInt(padding, 10) : parseInt(padding, 10);
+		return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
 	};
 	/**
 	 * @private

diff --git a/test/specs/core.helpers.tests.js b/test/specs/core.helpers.tests.js
@@ -790,7 +790,7 @@ describe('Core helper tests', function() {
 		div.style.height = '300px';
 		document.body.appendChild(div);
 
-		// Inner DIV to have 10% padding of parent
+		// Inner DIV to have 5% padding of parent
 		var innerDiv = document.createElement('div');
 
 		div.appendChild(innerDiv);
@@ -802,8 +802,8 @@ describe('Core helper tests', function() {
 		expect(helpers.getMaximumWidth(canvas)).toBe(300);
 
 		// test with percentage
-		innerDiv.style.padding = '10%';
-		expect(helpers.getMaximumWidth(canvas)).toBe(240);
+		innerDiv.style.padding = '5%';
+		expect(helpers.getMaximumWidth(canvas)).toBe(270);
 
 		// test with pixels
 		innerDiv.style.padding = '10px';