Consider left and top when determining value from pixel in category s…

…cale
chartjs · Jun 29, 2016 · 3660d9b · 3660d9b
1 parent 266df5e
commit 3660d9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
@@ -81,6 +81,8 @@ module.exports = function(Chart) {
 			var innerDimension = horz ? me.width - (me.paddingLeft + me.paddingRight) : me.height - (me.paddingTop + me.paddingBottom);
 			var valueDimension = innerDimension / offsetAmt;
 
+			pixel -= horz ? me.left : me.top;
+
 			if (me.options.gridLines.offsetGridLines) {
 				pixel -= (valueDimension / 2);
 			}

diff --git a/test/scale.category.tests.js b/test/scale.category.tests.js
@@ -154,7 +154,7 @@ describe('Category scale tests', function() {
 
 		expect(scale.getPixelForValue(0, 4, 0, false)).toBe(452);
 		expect(scale.getPixelForValue(0, 4, 0, true)).toBe(505);
-		expect(scale.getValueForPixel(452)).toBe(4);
+		expect(scale.getValueForPixel(453)).toBe(4);
 		expect(scale.getValueForPixel(505)).toBe(4);
 
 		config.gridLines.offsetGridLines = false;
@@ -282,7 +282,7 @@ describe('Category scale tests', function() {
 
 		expect(scale.getPixelForValue(0, 4, 0, false)).toBe(161);
 		expect(scale.getPixelForValue(0, 4, 0, true)).toBe(180);
-		expect(scale.getValueForPixel(161)).toBe(4);
+		expect(scale.getValueForPixel(162)).toBe(4);
 
 		config.gridLines.offsetGridLines = false;