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

cocoa: fix DrawImageRep (apply property before new context creation), fix memory management in TCocoaTextLayout

Browse Source 
git-svn-id: trunk@38883 -
This commit is contained in:
paul 2012-09-28 08:37:22 +00:00
parent 3f7d870c4d
commit 6129b92d32
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -940,17 +940,20 @@ end;
constructor TCocoaTextLayout.Create;
var
S: NSString;
LocalPool: NSAutoReleasePool;
begin
inherited Create;
LocalPool := NSAutoReleasePool.alloc.init;
FTextStorage := NSTextStorage.alloc.initWithString(NSSTR(''));
FLayout := NSLayoutManager.alloc.init;
FTextStorage.addLayoutManager(FLayout);
FTextContainer := NSTextContainer.alloc.init;
FTextContainer.setLineFragmentPadding(0);
FLayout.addTextContainer(FTextContainer);
FTextContainer.release;
S := NSSTR('');
FTextStorage := NSTextStorage.alloc.initWithString(S);
S.release;
FTextStorage.addLayoutManager(FLayout);
FLayout.release;
FTextStorage.retain;
LocalPool.release;
FFont := DefaultFont;
FFont.AddRef;
FText := '';
@ -969,7 +972,9 @@ procedure TCocoaTextLayout.SetFont(AFont: TCocoaFont);
begin
if FFont <> AFont then
begin
FFont.Release;
FFont := AFont;
FFont.AddRef;
FTextStorage.beginEditing;
updateFont;
FTextStorage.endEditing;
@ -1719,17 +1724,15 @@ var
Context: NSGraphicsContext;
begin
ctx.saveGraphicsState;
// we flip the context on it initialization (see InitDraw) so to draw
// a bitmap correctly we need to create a flipped context and to draw onto it
if not ctx.isFlipped then
Context := NSGraphicsContext.graphicsContextWithGraphicsPort_flipped(ctx.graphicsPort, True)
else
Context := ctx;
ctx.setCurrentContext(Context);
CGContextSetBlendMode(CGContext, kCGBlendModeNormal);
try
// we flip the context on it initialization (see InitDraw) so to draw
// a bitmap correctly we need to create a flipped context and to draw onto it
if not ctx.isFlipped then
Context := NSGraphicsContext.graphicsContextWithGraphicsPort_flipped(ctx.graphicsPort, True)
else
Context := ctx;
ctx.setCurrentContext(Context);
Result := ImageRep.drawInRect_fromRect_operation_fraction_respectFlipped_hints(
dstRect, srcRect, NSCompositeSourceOver, 1.0, True, nil
);