From 9595273e55b3e2d6cdb9113b2d786a448bbeeb9c Mon Sep 17 00:00:00 2001
From: ask <ask@lazarus-ide.org>
Date: Wed, 22 Jun 2011 13:18:12 +0000
Subject: [PATCH] TAChart: Extract public TChartLegend.MeasureItem function

git-svn-id: trunk@31332 -
---
 components/tachart/talegend.pas | 34 ++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/components/tachart/talegend.pas b/components/tachart/talegend.pas
index ee0f2ceac2..06be195885 100644
--- a/components/tachart/talegend.pas
+++ b/components/tachart/talegend.pas
@@ -143,6 +143,8 @@ type
       ADrawer: IChartDrawer; AItems: TObjectList; const ABounds: TRect);
     function Prepare(
       ADrawer: IChartDrawer; AItems: TObjectList; var AClipRect: TRect): TRect;
+    // Not includes the margins around item.
+    function MeasureItem(ADrawer: IChartDrawer; AItems: TObjectList): TPoint;
   published
     property Alignment: TLegendAlignment
       read FAlignment write SetAlignment default laTopRight;
@@ -381,30 +383,36 @@ begin
   end;
 end;
 
+function TChartLegend.MeasureItem(
+  ADrawer: IChartDrawer; AItems: TObjectList): TPoint;
+var
+  i: Integer;
+begin
+  ADrawer.Font := Font;
+  Result := Point(0, 0);
+  for i := 0 to AItems.Count - 1 do
+    with ADrawer.TextExtent((AItems[i] as TLegendItem).FText) do begin
+      Result.X := Max(X, Result.X);
+      Result.Y := Max(Y, Result.Y);
+    end;
+
+  Result.X += SYMBOL_TEXT_SPACING + SymbolWidth;
+end;
+
 function TChartLegend.Prepare(
   ADrawer: IChartDrawer; AItems: TObjectList; var AClipRect: TRect): TRect;
 var
-  x, y, i, textHeight: Integer;
+  x, y: Integer;
   sidebar, legendSize: TPoint;
 begin
-  ADrawer.Font := Font;
+  with MeasureItem(ADrawer, AItems) do
+    legendSize := Point(X + 2 * Spacing, Spacing + AItems.Count * (Y + Spacing));
 
-  // Measure the legend.
-  legendSize.X := 0;
-  textHeight := 0;
-  for i := 0 to AItems.Count - 1 do
-    with ADrawer.TextExtent((AItems[i] as TLegendItem).FText) do begin
-      legendSize.X := Max(X, legendSize.X);
-      textHeight := Max(Y, textHeight);
-    end;
-
-  legendSize.X += 2 * Spacing + SYMBOL_TEXT_SPACING + SymbolWidth;
   sidebar.X := 2 * MarginX;
   with AClipRect do
     legendSize.X := EnsureRange(legendSize.X, 0, Right - Left - sidebar.X);
   sidebar.X += legendSize.X;
 
-  legendSize.Y := Spacing + AItems.Count * (textHeight + Spacing);
   sidebar.Y := 2 * MarginX;
   with AClipRect do
     legendSize.Y := EnsureRange(legendSize.Y, 0, Bottom - Top - sidebar.Y);