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

Merge branch 'TextOutWithFloatPos' into 'main'

Browse Source 
Cocoa: Add version of TCocoaContext.TextOut() with float instead of Integer position params

See merge request freepascal.org/lazarus/lazarus!350
This commit is contained in:
rich2014 2024-10-24 00:36:38 +00:00
commit 445ae535ce
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/cocoa/cocoagdiobjects.pas
View File

@ -410,6 +410,7 @@ type
procedure BackgroundFill(dirtyRect:NSRect);
procedure Ellipse(X1, Y1, X2, Y2: Integer);
procedure TextOut(X, Y: Integer; Options: Longint; Rect: PRect; UTF8Chars: PChar; Count: Integer; CharsDelta: PInteger);
procedure TextOut(X, Y: CGFloat; Options: Longint; Rect: PRect; UTF8Chars: PChar; Count: Integer; CharsDelta: CGFloatPtr);
procedure DrawEdge(var Rect: TRect; edge: Cardinal; grfFlags: Cardinal);
procedure Frame(const R: TRect);
procedure Frame3dClassic(var ARect: TRect; const FrameWidth: integer; const Style: TBevelCut);
@ -1789,6 +1790,21 @@ begin
end;
procedure TCocoaContext.TextOut(X, Y: Integer; Options: Longint; Rect: PRect; UTF8Chars: PChar; Count: Integer; CharsDelta: PInteger);
var
CharsDeltaFloat: Array of CGFloat;
i: integer;
begin
if CharsDelta <> nil then begin
SetLength(CharsDeltaFloat, Count);
for i := 0 to Count - 1 do
CharsDeltaFloat[i] := CharsDelta[i];
TextOut(X,Y,Options, Rect, UTF8Chars, Count, @CharsDeltaFloat[0]);
end
else
TextOut(X,Y,Options, Rect, UTF8Chars, Count, CGFloatPtr(nil));
end;
procedure TCocoaContext.TextOut(X, Y: CGFloat; Options: Longint; Rect: PRect; UTF8Chars: PChar; Count: Integer; CharsDelta: CGFloatPtr);
const
UnderlineStyle = NSUnderlineStyleSingle or NSUnderlinePatternSolid;
var