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

cocoa: Patch from issue #28509 use cgfloat

Browse Source 
git-svn-id: trunk@49632 -
This commit is contained in:
sekelsenmat 2015-08-10 18:34:09 +00:00
parent ffae572f14
commit 58cbaacbda
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ type
public
constructor Create(const AColor: TColor; ASolid, AGlobal: Boolean); reintroduce;
procedure SetColor(const AColor: TColor; ASolid: Boolean);
procedure GetRGBA(AROP2: Integer; out AR, AG, AB, AA: Single);
procedure GetRGBA(AROP2: Integer; out AR, AG, AB, AA: CGFloat);
function CreateNSColor: NSColor;
property Red: Byte read FR write FR;
@ -146,13 +146,13 @@ type
const
// use the same pen shapes that are used for carbon
CocoaDashStyle: Array [0..1] of Single = (3, 1);
CocoaDotStyle: Array [0..1] of Single = (1, 1);
CocoaDashDotStyle: Array [0..3] of Single = (3, 1, 1, 1);
CocoaDashDotDotStyle: Array [0..5] of Single = (3, 1, 1, 1, 1, 1);
CocoaDashStyle: Array [0..1] of CGFloat = (3, 1);
CocoaDotStyle: Array [0..1] of CGFloat = (1, 1);
CocoaDashDotStyle: Array [0..3] of CGFloat = (3, 1, 1, 1);
CocoaDashDotDotStyle: Array [0..5] of CGFloat = (3, 1, 1, 1, 1, 1);
type
TCocoaDashes = array of Float32;
TCocoaDashes = array of CGFloat;
{ TCocoaPen }
@ -669,7 +669,7 @@ begin
FA := ASolid;
end;
procedure TCocoaColorObject.GetRGBA(AROP2: Integer; out AR, AG, AB, AA: Single);
procedure TCocoaColorObject.GetRGBA(AROP2: Integer; out AR, AG, AB, AA: CGFloat);
var alpha:single;
begin
if FA then
@ -2514,7 +2514,7 @@ procedure TCocoaPen.Apply(ADC: TCocoaContext; UseROP2: Boolean = True);
end;
var
AR, AG, AB, AA: Single;
AR, AG, AB, AA: CGFloat;
AROP2: Integer;
ADashes: TCocoaDashes;
begin
@ -2919,7 +2919,7 @@ end;
procedure TCocoaBrush.Apply(ADC: TCocoaContext; UseROP2: Boolean = True);
var
RGBA: array[0..3] of Single;
RGBA: array[0..3] of CGFloat;
AROP2: Integer;
APatternSpace: CGColorSpaceRef;
BaseSpace: CGColorSpaceRef;