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

cocoa: some work on pattern brushes created by NSColor

Browse Source 
git-svn-id: trunk@34431 -
This commit is contained in:
paul 2011-12-26 13:27:28 +00:00
parent 383fbee849
commit 33bbf3a144
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2291,7 +2291,8 @@ begin
FillChar(ACallBacks, SizeOf(ACallBacks), 0);
ACallBacks.drawPattern := @DrawBitmapPattern;
FImage := AImage.CGImageForProposedRect_context_hints(nil, nil, nil);
FColored := True;
CGImageRetain(FImage);
FColored := False;
Rect.origin.x := 0;
Rect.origin.y := 0;
Rect.size := CGSize(AImage.size);
@ -2318,7 +2319,7 @@ begin
PatternColor := AColor.colorUsingColorSpaceName(NSPatternColorSpace);
if Assigned(PatternColor) then
begin
SetColor(0, False);
SetColor(NSColorToColorRef(PatternColor.patternImage.backgroundColor), False);
SetImage(PatternColor.patternImage);
end
else
@ -2381,7 +2382,7 @@ begin
PatternColor := AColor.colorUsingColorSpaceName(NSPatternColorSpace);
if Assigned(PatternColor) then
begin
inherited Create(0, False, AGlobal);
inherited Create(NSColorToColorRef(PatternColor.patternImage.backgroundColor), False, AGlobal);
SetImage(PatternColor.patternImage);
end
else
@ -2423,7 +2424,7 @@ var
RGBA: array[0..3] of Single;
AROP2: Integer;
APatternSpace: CGColorSpaceRef;
BaseSpace : CGColorSpaceRef;
BaseSpace: CGColorSpaceRef;
begin
if ADC = nil then Exit;
@ -2439,13 +2440,13 @@ begin
else
CGContextSetBlendMode(ADC.CGContext, kCGBlendModeDifference);
if FCGPattern <> nil then
if Assigned(FCGPattern) then
begin
if not FColored then
BaseSpace:=CGColorSpaceCreateDeviceRGB
BaseSpace := CGColorSpaceCreateDeviceRGB
else
begin
BaseSpace:=nil;
BaseSpace := nil;
RGBA[0] := 1.0;
end;
APatternSpace := CGColorSpaceCreatePattern(BaseSpace);

2
lcl/interfaces/cocoa/cocoautils.pas
View File

@ -118,7 +118,7 @@ begin
else
begin
// compute an average color of the top left 2x2 rectangle
ImageRep := PatternColor.patternImage.bestRepresentationForRect_context_hints(RectToNSRect(Types.Rect(0, 0, 1, 1)), nil, nil);
ImageRep := PatternColor.patternImage.bestRepresentationForRect_context_hints(NSNullRect, nil, nil);
if (ImageRep = nil) or not ImageRep.isKindOfClass(NSBitmapImageRep) then
Result := 0
else