From 457fefbc6d406f444a5c691d4b728f141f8779cb Mon Sep 17 00:00:00 2001 From: Will Charczuk Date: Sat, 30 Jul 2016 10:01:16 -0700 Subject: [PATCH] fixing undertick --- xaxis.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xaxis.go b/xaxis.go index 80162cc..6793fbe 100644 --- a/xaxis.go +++ b/xaxis.go @@ -110,20 +110,22 @@ func (xa XAxis) Render(r Renderer, canvasBox Box, ra Range, defaults Style, tick for index, t := range ticks { v := t.Value lx := ra.Translate(v) - tb := r.MeasureText(t.Label) tx = canvasBox.Left + lx - ty = canvasBox.Bottom + DefaultXAxisMargin + tb.Height() tickStyle.GetStrokeOptions().WriteToRenderer(r) r.MoveTo(tx, canvasBox.Bottom) r.LineTo(tx, canvasBox.Bottom+DefaultVerticalTickHeight) r.Stroke() + tickStyle.GetTextOptions().WriteToRenderer(r) + tb := r.MeasureText(t.Label) + switch tp { - case TickPositionUnderTick: - tickStyle.GetTextOptions().WriteToRenderer(r) + case TickPositionUnderTick, TickPositionUnset: + ty = canvasBox.Bottom + DefaultXAxisMargin + tb.Height() r.Text(t.Label, tx-tb.Width()>>1, ty) + break case TickPositionBetweenTicks: if index > 0 { llx := ra.Translate(ticks[index-1].Value) @@ -135,6 +137,7 @@ func (xa XAxis) Render(r Renderer, canvasBox Box, ra Range, defaults Style, tick Bottom: canvasBox.Bottom + DefaultXAxisMargin + tb.Height(), }, tickStyle.InheritFrom(Style{TextHorizontalAlign: TextHorizontalAlignCenter})) } + break } }