From 0bd0654efb4a19f192a485d88daadbe8ee2f44c0 Mon Sep 17 00:00:00 2001 From: Rittyan Date: Tue, 3 Oct 2017 07:33:03 +0900 Subject: [PATCH] fix colour settings of BeforeLabel and BeforeBody (#4783) * fix colour settings of BeforeLabel and BeforeBody * delete redundant variable declaration * collect label colour setting. --- src/core/core.tooltip.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js index 048e1a08a..2acd31e05 100644 --- a/src/core/core.tooltip.js +++ b/src/core/core.tooltip.js @@ -677,6 +677,7 @@ module.exports = function(Chart) { }; // Before body lines + ctx.fillStyle = mergeOpacity(vm.bodyFontColor, opacity); helpers.each(vm.beforeBody, fillLineOfText); var drawColorBoxes = vm.displayColors; @@ -684,6 +685,8 @@ module.exports = function(Chart) { // Draw body lines now helpers.each(body, function(bodyItem, i) { + var textColor = mergeOpacity(vm.labelTextColors[i], opacity); + ctx.fillStyle = textColor; helpers.each(bodyItem.before, fillLineOfText); helpers.each(bodyItem.lines, function(line) { @@ -701,7 +704,6 @@ module.exports = function(Chart) { // Inner square ctx.fillStyle = mergeOpacity(vm.labelColors[i].backgroundColor, opacity); ctx.fillRect(pt.x + 1, pt.y + 1, bodyFontSize - 2, bodyFontSize - 2); - var textColor = mergeOpacity(vm.labelTextColors[i], opacity); ctx.fillStyle = textColor; } -- 2.47.3