From 520c8080121bbc2db67a700f9f1e2d4859a8f6ca Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Mon, 9 May 2011 12:56:13 -0400 Subject: [PATCH] consider whether axes are displayed when computing area --- dygraph-canvas.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dygraph-canvas.js b/dygraph-canvas.js index fb454c9..471d9e4 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -334,12 +334,18 @@ DygraphCanvasRenderer.prototype.attr_ = function(x) { DygraphCanvasRenderer.prototype.computeArea_ = function() { var area = { // TODO(danvk): per-axis setting. - x: this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'), + x: 0, y: 0 }; + if (this.attr_('drawYAxis')) { + area.x = this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'); + } + area.w = this.width - area.x - this.attr_('rightGap'); - area.h = this.height - this.attr_('axisLabelFontSize') - - 2 * this.attr_('axisTickSize'); + area.h = this.height; + if (this.attr_('drawXAxis')) { + area.h -= this.attr_('axisLabelFontSize') + 2 * this.attr_('axisTickSize'); + } // Shrink the drawing area to accomodate additional y-axes. if (this.dygraph_.numAxes() == 2) { -- 2.7.4