More fixes

chartjs · May 28, 2019 · 0809bcc · 0809bcc
1 parent 67bf089
commit 0809bcc
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/core/core.layouts.js b/src/core/core.layouts.js
@@ -155,7 +155,7 @@ function fitHorizontalBoxes(boxes, params) {
 	addSizeByPosition(boxes, outerBoxSizes);
 }
 
-function fitVerticalBoxes(boxes, params) {
+function fitVerticalBoxes(boxes, params, finalFit) {
 	var maxPadding = params.maxPadding;
 	var outerBoxSizes = params.outerBoxSizes;
 	var i, ilen, layout, box, margin;
@@ -164,7 +164,7 @@ function fitVerticalBoxes(boxes, params) {
 		layout = boxes[i];
 		box = layout.box;
 
-		margin = boxes.fitted && {
+		margin = finalFit && {
 			left: 0,
 			right: 0,
 			top: Math.max(outerBoxSizes.top, maxPadding.top),
@@ -173,10 +173,9 @@ function fitVerticalBoxes(boxes, params) {
 
 		box.update(params.vBoxMaxWidth, params.chartAreaHeight, margin);
 	}
-	if (!boxes.fitted) {
+	if (!finalFit) {
 		addSizeByPosition(boxes, outerBoxSizes);
 	}
-	boxes.fitted = true;
 }
 
 function calculateChartArea(params) {
@@ -226,16 +225,15 @@ function placeVerticalBox(box, left, params) {
 function placeBoxes(boxes, params) {
 	var top = params.top;
 	var left = params.left;
-	var outerBoxSizes = params.outerBoxSizes;
 	var i, ilen, layout, box;
 
 	for (i = 0, ilen = boxes.length; i < ilen; ++i) {
 		layout = boxes[i];
 		box = layout.box;
 		if (layout.isHorizontal) {
-			top = placeHorizontalBox(box, top, params, outerBoxSizes);
+			top = placeHorizontalBox(box, top, params);
 		} else {
-			left = placeVerticalBox(box, left, params, outerBoxSizes);
+			left = placeVerticalBox(box, left, params);
 		}
 	}
 	params.top = top;
@@ -427,7 +425,7 @@ module.exports = {
 		fitVerticalBoxes(boxes.vertical, params);
 		fitHorizontalBoxes(boxes.horizontal, params);
 		// final fit for vertical boxes, using margins
-		fitVerticalBoxes(boxes.vertical, params);
+		fitVerticalBoxes(boxes.vertical, params, true);
 
 		// Recalculate because the size of each layout might have changed slightly
 		// due to the margins (label rotation for instance)