This fixes #2584 (#2592)

Improve scale auto-skipper when labels are not rotated

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 9861288cd33c93e2770351e2366416d9bd8ae3b0..cf145dc67c5e019599e1b7d8c1006f9b71b859b4 100644 (file)
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -506,8 +506,14 @@ module.exports = function(Chart) {
                                var yTickEnd = options.position === "bottom" ? this.top + tl : this.bottom;
                                skipRatio = false;
 
-                               if (((longestRotatedLabel / 2) + optionTicks.autoSkipPadding) * this.ticks.length > (this.width - (this.paddingLeft + this.paddingRight))) {
-                                       skipRatio = 1 + Math.floor((((longestRotatedLabel / 2) + optionTicks.autoSkipPadding) * this.ticks.length) / (this.width - (this.paddingLeft + this.paddingRight)));
+                // Only calculate the skip ratio with the half width of longestRotateLabel if we got an actual rotation
+                // See #2584
+                if (isRotated) {
+                    longestRotatedLabel /= 2;
+                }
+
+                               if ((longestRotatedLabel + optionTicks.autoSkipPadding) * this.ticks.length > (this.width - (this.paddingLeft + this.paddingRight))) {
+                                       skipRatio = 1 + Math.floor(((longestRotatedLabel + optionTicks.autoSkipPadding) * this.ticks.length) / (this.width - (this.paddingLeft + this.paddingRight)));
                                }
 
                                // if they defined a max number of optionTicks,