From cc737eae7b2e0a742f95668d18a90b13173c388e Mon Sep 17 00:00:00 2001 From: Fabien Bodard Date: Sun, 20 Apr 2008 07:55:10 +0000 Subject: [PATCH] I've forget some little things git-svn-id: svn://localhost/gambas/trunk@1327 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- comp/src/gb.chart/Chart.class | 1 + comp/src/gb.chart/MTools.module | 6 ++++-- comp/src/gb.chart/_CLegend.class | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/comp/src/gb.chart/Chart.class b/comp/src/gb.chart/Chart.class index b36181b89..5c1f35e1c 100644 --- a/comp/src/gb.chart/Chart.class +++ b/comp/src/gb.chart/Chart.class @@ -158,6 +158,7 @@ Public Sub Draw() If Not IsNull(Me.Title.Text) And Me.Title.Visible Then 'Draw.Font.Grade = 4 + Draw.Font = $oTitle.Font Draw.Font.Size = $oTitle.Font.Size * _fProportionnal iTitleHeight = Draw.Font.Height() * 1.5 Endif diff --git a/comp/src/gb.chart/MTools.module b/comp/src/gb.chart/MTools.module index bab14246a..0319e4abc 100644 --- a/comp/src/gb.chart/MTools.module +++ b/comp/src/gb.chart/MTools.module @@ -86,7 +86,7 @@ Public Function DrawChartAxes(oChart As Chart, hChartRect As CRect, fMinValue As Endif Endif - + Draw.Font = Chart.YAxe.Font Draw.Font.Size = Chart.YAxe.Font.Size * Chart._fProportionnal For f = 0 To fMaxValue Step fStep 'Round(fMaxValue / 20) 'Position du taquet @@ -115,6 +115,7 @@ Endif Endif fTabPos = hChartRect.Left If iAlign = Align.Center Then + Draw.Font = Chart.XAxe.Font Draw.Font.Size = Chart.XAxe.Font.Size * Chart._fProportionnal For Each oSerie In Chart fTabPos += fXUnit * (Chart.Count + 1) @@ -202,7 +203,7 @@ Public Function DrawVertChartAxes(oChart As Chart, hChartRect As CRect, fMinValu Endif Endif - + Draw.Font = Chart.XAxe.Font Draw.Font.Size = Chart.XAxe.Font.Size * Chart._fProportionnal For f = 0 To fMaxValue Step fStep 'Round(fMaxValue / 20) 'Position du taquet @@ -234,6 +235,7 @@ Endif Endif fTabPos = hChartRect.Bottom If iAlign = Align.Center Then + Draw.Font = Chart.YAxe.Font Draw.Font.Size = Chart.YAxe.Font.Size * Chart._fProportionnal For Each oSerie In Chart diff --git a/comp/src/gb.chart/_CLegend.class b/comp/src/gb.chart/_CLegend.class index f756c6624..39fb5f52e 100644 --- a/comp/src/gb.chart/_CLegend.class +++ b/comp/src/gb.chart/_CLegend.class @@ -97,7 +97,7 @@ Public Sub Draw(bSeries As Boolean) i = draw.TextWidth(s) If i > cnt Then cnt = i Next - + draw.Font = $oFont draw.Font.Size = $oFont.Size * Chart._fProportionnal SQUARESIZE = draw.TextHeight("T")