paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-26 15:00:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

added items count value of dx-array parameter for routines implementing ExtTextOut function

Browse Source 
git-svn-id: trunk@19976 -
This commit is contained in:
dmitry 2009-05-16 03:41:53 +00:00
parent 414194be74
commit 20c1109b87
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lcl/interfaces/carbon/carbongdiobjects.pp
View File

@ -89,7 +89,7 @@ type
FLineRotation: Fixed;
public
procedure Apply(ADC: TCarbonContext); virtual; abstract;
function Draw(X, Y: Integer; DX: PInteger): Boolean; virtual; abstract;
function Draw(X, Y: Integer; DX: PInteger; DXCount: Integer): Boolean; virtual; abstract;
procedure Release; virtual;
function GetHeight: Integer;
@ -110,13 +110,15 @@ type
FWidget: HIViewRef;
FTextBuffer: WideString;
FDC: TCarbonContext;
FDX: Integer;
FDXCount: Integer;
FDX: PInteger;
Idx: Integer;
protected
procedure DoJustify(iLineRef: ATSULineRef; var Handled: Boolean);
public
constructor Create(const Text: String; Font: TCarbonFont; TextFractional: Boolean);
procedure Apply(ADC: TCarbonContext); override;
function Draw(X, Y: Integer; DX: PInteger): Boolean; override;
function Draw(X, Y: Integer; DX: PInteger; DXCount: Integer): Boolean; override;
procedure Release; override;
property Layout: ATSUTextLayout read FLayout;
@ -132,7 +134,7 @@ type
public
constructor Create(const Text: String; Font: TCarbonFont);
procedure Apply(ADC: TCarbonContext); override;
function Draw(X, Y: Integer; DX: PInteger): Boolean; override;
function Draw(X, Y: Integer; DX: PInteger; DXCount: Integer): Boolean; override;
end;
{ TCarbonFont }
@ -939,17 +941,23 @@ var
Count : ItemCount;
i : Integer;
begin
ATSUDirectGetLayoutDataArrayPtrFromLineRef (iLineRef,
kATSUDirectDataAdvanceDeltaFixedArray, true, @Deltas, Count);
if Assigned(Deltas) and (Count > 0) then
if idx < FDXCount then
begin
for i := 1 to Count - 1 do
Deltas^[i] := Long2Fix(FDX);
Handled := true;
ATSUDirectGetLayoutDataArrayPtrFromLineRef (iLineRef,
kATSUDirectDataAdvanceDeltaFixedArray, true, @Deltas, Count);
if Assigned(Deltas) and (Count > 0) then
begin
for i := 1 to Min(FDXCount - idx, Count) - 1 do
begin
Deltas^[i] := Long2Fix(FDX[idx]);
inc(idx);
end;
Handled := true;
end;
end;
end;
function TCarbonTextLayoutBuffer.Draw(X, Y: Integer; Dx: PInteger): Boolean;
function TCarbonTextLayoutBuffer.Draw(X, Y: Integer; Dx: PInteger; DXCount: Integer): Boolean;
var
MX, MY: ATSUTextMeasurement;
A: Single;
@ -973,7 +981,9 @@ begin
end;
if Assigned(Dx) then begin
FDX := Dx^;
FDX := Dx;
FDxCount := DXCount;
idx:=0;
OverSpec.operationSelector := kATSULayoutOperationJustification;
OverSpec.overrideUPP := NewATSUDirectLayoutOperationOverrideUPP(@ATSUCallback);
theTag := kATSULayoutOperationOverrideTag;
@ -1052,17 +1062,23 @@ begin
end;
end;
function TCarbonTextLayoutArray.Draw(X, Y: Integer; Dx: PInteger): Boolean;
function TCarbonTextLayoutArray.Draw(X, Y: Integer; Dx: PInteger; DXCount: Integer): Boolean;
var
I: Integer;
I : Integer;
ix : Integer;
begin
Result := False;
ix := 0;
for I := 1 to Length(FText) do
begin
Result := FFont.FCachedLayouts[Ord(FText[I])].Draw(X, Y, nil);
if Assigned(dx) then Inc(X, Dx^)
else Inc(X, FFont.FCachedLayouts[Ord(FText[I])].GetWidth);
Result := FFont.FCachedLayouts[Ord(FText[I])].Draw(X, Y, nil, 0);
if Assigned(dx) and (ix < DXCount) then
begin
Inc(X, Dx[ix]);
inc(ix);
end
else
Inc(X, FFont.FCachedLayouts[Ord(FText[I])].GetWidth);
end;
Result := True;