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

Merge pull request #1485 from BenWoodford/label-patches

Browse Source 
Label customisation fixes
This commit is contained in:
Evert Timberg 2015-09-24 11:07:51 -04:00
commit d1067f956c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scales/scale.category.js
View File

@ -147,7 +147,7 @@
var datasetWidth = Math.floor(this.getPixelForValue(0, 1) - this.getPixelForValue(0, 0)) - 6; var datasetWidth = Math.floor(this.getPixelForValue(0, 1) - this.getPixelForValue(0, 0)) - 6;
//Max label rotation can be set or default to 90 - also act as a loop counter //Max label rotation can be set or default to 90 - also act as a loop counter
while (this.labelWidth > datasetWidth && this.labelRotation <= this.options.labels.maxRotation) { while (this.labelWidth > datasetWidth && this.labelRotation < this.options.labels.maxRotation) {
cosRotation = Math.cos(helpers.toRadians(this.labelRotation)); cosRotation = Math.cos(helpers.toRadians(this.labelRotation));
sinRotation = Math.sin(helpers.toRadians(this.labelRotation)); sinRotation = Math.sin(helpers.toRadians(this.labelRotation));
@ -303,7 +303,7 @@
if (this.options.labels.show) { if (this.options.labels.show) {
this.ctx.save(); this.ctx.save();
this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 : this.top + 8); this.ctx.translate(xLabelValue, (isRotated) ? this.top + 12 + this.options.labels.padding : this.top + this.options.labels.padding);
this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1); this.ctx.rotate(helpers.toRadians(this.labelRotation) * -1);
this.ctx.font = this.font; this.ctx.font = this.font;
this.ctx.textAlign = (isRotated) ? "right" : "center"; this.ctx.textAlign = (isRotated) ? "right" : "center";