Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Core Scale now plays nice with layoutService and full width

Browse Source
This commit is contained in:
Tanner Linsley 2015-10-27 02:33:19 -06:00
parent 9ab505caec
commit 15ff3f9edc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/core.scale.js
View File

@ -68,7 +68,12 @@
// Absorb the master measurements // Absorb the master measurements
this.maxWidth = maxWidth; this.maxWidth = maxWidth;
this.maxHeight = maxHeight; this.maxHeight = maxHeight;
this.margins = margins; this.margins = helpers.extend({
left: 0,
right: 0,
top: 0,
bottom: 0
}, margins);
// Dimensions // Dimensions
this.beforeSetDimensions(); this.beforeSetDimensions();
@ -229,7 +234,8 @@
// Width // Width
if (this.isHorizontal()) { if (this.isHorizontal()) {
this.minSize.width = this.maxWidth; // fill all the width // subtract the margins to line up with the chartArea
this.minSize.width = this.maxWidth - this.margins.left - this.margins.right;
} else { } else {
this.minSize.width = this.options.gridLines.show && this.options.display ? 10 : 0; this.minSize.width = this.options.gridLines.show && this.options.display ? 10 : 0;
} }
@ -352,7 +358,7 @@
if (includeOffset) { if (includeOffset) {
pixel += tickWidth / 2; pixel += tickWidth / 2;
} }
return this.left + Math.round(pixel); return this.left + this.margins.left + Math.round(pixel);
} else { } else {
var innerHeight = this.height - (this.paddingTop + this.paddingBottom); var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
return this.top + (index * (innerHeight / (this.ticks.length - 1))); return this.top + (index * (innerHeight / (this.ticks.length - 1)));
@ -365,7 +371,7 @@
var innerWidth = this.width - (this.paddingLeft + this.paddingRight); var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
var valueOffset = (innerWidth * decimal) + this.paddingLeft; var valueOffset = (innerWidth * decimal) + this.paddingLeft;
return this.left + Math.round(valueOffset); return this.left + this.margins.left + Math.round(valueOffset);
} else { } else {
return this.top + (decimal * this.height); return this.top + (decimal * this.height);
} }