From: etimberg <evert.timberg@gmail.com>
Date: Tue, 24 Nov 2015 03:12:34 +0000 (-0500)
Subject: Improve drawing when title is placed below legend boxes
X-Git-Tag: 2.0.0-beta2~25^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37abe74d4302c646d4ee34ad08791d91b7958b8e;p=thirdparty%2FChart.js.git

Improve drawing when title is placed below legend boxes
---

diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index ab6943e89..f4d6fab4d 100644
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -226,8 +226,13 @@
 				if (this.isHorizontal()) {
 
 					// Title Spacing if on top
-					if (this.options.title.display && this.options.title.position == 'top') {
-						cursor.y += this.options.title.fontSize + (this.options.title.padding * 2);
+					if (this.options.title.display) {
+						if (this.options.title.position === 'top') {
+							cursor.y += this.options.title.fontSize + (this.options.title.padding * 2);
+						} else {
+							// bottom
+							cursor.y += this.options.labels.padding;
+						}
 					}
 
 					// Labels
@@ -246,6 +251,7 @@
 
 						var textWidth = ctx.measureText(label).width;
 						var width = this.options.labels.boxWidth + (this.options.labels.fontSize / 2) + textWidth;
+						
 						if (cursor.x + width >= this.width) {
 							cursor.y += this.options.labels.fontSize + (this.options.labels.padding);
 							cursor.line++;
@@ -295,7 +301,7 @@
 					}, this);
 
 					// Title Spacing if on bottom
-					if (this.options.title.display && this.options.title.position == 'bottom') {
+					if (this.options.title.display && this.options.title.position === 'bottom') {
 						cursor.y += this.options.title.fontSize + (this.options.title.padding * 2);
 					}
 
@@ -308,7 +314,7 @@
 						ctx.font = helpers.fontString(this.options.title.fontSize, this.options.title.fontStyle, this.options.title.fontFamily);
 
 						var titleX = this.left + ((this.right - this.left) / 2); // midpoint of the width
-						var titleY = this.options.position == 'bottom' ? this.bottom - (this.options.title.fontSize / 2) - this.options.title.padding : this.top + (this.options.title.fontSize / 2) + this.options.title.padding;
+						var titleY = this.options.title.position == 'bottom' ? this.bottom - (this.options.title.fontSize / 2) - this.options.title.padding : this.top + (this.options.title.fontSize / 2) + this.options.title.padding;
 
 						ctx.fillText(this.options.title.text, titleX, titleY);
 					}