From 3192129e6ee7aaa7a48e5da7abe57cd67e450134 Mon Sep 17 00:00:00 2001
From: ask <ask@lazarus-ide.org>
Date: Thu, 30 Aug 2012 05:54:23 +0000
Subject: [PATCH] TAChart: Move DrawXorText to TADrawerCanvas unit

git-svn-id: trunk@38434 -
---
 components/tachart/tadatatools.pas    | 33 +++++----------------------
 components/tachart/tadrawercanvas.pas | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/components/tachart/tadatatools.pas b/components/tachart/tadatatools.pas
index 302e3fbde1..9e8a34ca18 100644
--- a/components/tachart/tadatatools.pas
+++ b/components/tachart/tadatatools.pas
@@ -113,8 +113,8 @@ type
 implementation
 
 uses
-  FPCanvas, Graphics, GraphMath, LCLIntf, LCLType, Math, SysUtils, Types,
-  TAChartAxis, TACustomSeries, TAGeometry;
+  FPCanvas, Graphics, GraphMath, Math, SysUtils, Types,
+  TAChartAxis, TACustomSeries, TADrawerCanvas, TAGeometry;
 
 const
   DEF_DISTANCE_FORMAT = '%0:.9g';
@@ -136,7 +136,7 @@ constructor TDataPointDistanceToolMarks.Create(AOwner: TCustomChart);
 begin
   inherited Create(AOwner);
   FDistance := DEF_MARKS_DISTANCE;
-  FLabelBrush.Color := clYellow;
+  SetPropDefaults(FLabelBrush, ['Color']);
   Format := DEF_DISTANCE_FORMAT;
 end;
 
@@ -195,29 +195,6 @@ begin
 end;
 
 procedure TDataPointDistanceTool.DoDraw;
-
-  procedure DrawXorText(ACanvas: TCanvas; APoint: TPoint; const AText: String);
-  var
-    bmp: TBitmap;
-    ext: TSize;
-  begin
-    ext := ACanvas.TextExtent(AText);
-    bmp := TBitmap.Create;
-    try
-      bmp.SetSize(ext.cx, ext.cy);
-      bmp.Canvas.Brush.Style := bsClear;
-      bmp.Canvas.Font := ACanvas.Font;
-      bmp.Canvas.Font.Color := clWhite;
-      bmp.Canvas.TextOut(0, 0, AText);
-      APoint -= ext div 2;
-      BitBlt(
-        ACanvas.Handle, APoint.X, APoint.Y, ext.cx, ext.cy,
-        bmp.Canvas.Handle, 0, 0, SRCINVERT);
-    finally
-      bmp.Free;
-    end;
-  end;
-
 var
   a: Double;
 
@@ -348,8 +325,10 @@ begin
   finally
     FreeAndNil(newEnd);
   end;
-  if EffectiveDrawingMode = tdmXor then
+  if EffectiveDrawingMode = tdmXor then begin
+    FChart.Drawer.SetXorPen(FPen);
     DoDraw;
+  end;
   Handled;
 end;
 
diff --git a/components/tachart/tadrawercanvas.pas b/components/tachart/tadrawercanvas.pas
index 5c99635351..c50dff9834 100644
--- a/components/tachart/tadrawercanvas.pas
+++ b/components/tachart/tadrawercanvas.pas
@@ -76,10 +76,12 @@ type
 
   function CanvasGetFontOrientationFunc(AFont: TFPCustomFont): Integer;
   function ChartColorSysToFPColor(AChartColor: TChartColor): TFPColor;
+  procedure DrawXorText(ACanvas: TCanvas; APoint: TPoint; const AText: String);
 
 implementation
 
 uses
+  LCLIntf, LCLType,
   TAGeometry;
 
 function CanvasGetFontOrientationFunc(AFont: TFPCustomFont): Integer;
@@ -95,6 +97,28 @@ begin
   Result := ChartColorToFPColor(ColorToRGB(AChartColor));
 end;
 
+procedure DrawXorText(ACanvas: TCanvas; APoint: TPoint; const AText: String);
+var
+  bmp: TBitmap;
+  ext: TPoint;
+begin
+  ext := ACanvas.TextExtent(AText);
+  bmp := TBitmap.Create;
+  try
+    bmp.SetSize(ext.X, ext.Y);
+    bmp.Canvas.Brush.Style := bsClear;
+    bmp.Canvas.Font := ACanvas.Font;
+    bmp.Canvas.Font.Color := clWhite;
+    bmp.Canvas.TextOut(0, 0, AText);
+    APoint -= ext div 2;
+    BitBlt(
+      ACanvas.Handle, APoint.X, APoint.Y, ext.X, ext.Y,
+      bmp.Canvas.Handle, 0, 0, SRCINVERT);
+  finally
+    bmp.Free;
+  end;
+end;
+
 { TCanvasDrawer }
 
 procedure TCanvasDrawer.AddToFontOrientation(ADelta: Integer);