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

cocoa: Fixes problem with DC state saving for clipping, this fixes bug #28015

Browse Source 
git-svn-id: trunk@48917 -
This commit is contained in:
sekelsenmat 2015-05-02 15:45:49 +00:00
parent 9c77d7629c
commit c9dce2ea9a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,6 +350,9 @@ type
// So before every single clip operation we need to save the DC state
// And before every single clip operator or savedc/restoredc
// we need to restore the dc to clear the clipping region
//
// Also, because of bug 28015 FClipped cannot use ctx.Restore(Save)GraphicsState;
// it will use CGContextRestore(Save)GState(CGContext()); to save/restore DC instead
FClipped: Boolean;
FClipRegion: TCocoaRegion;
FSavedDCList: TFPObjectList;
@ -1262,7 +1265,7 @@ begin
FClipRegion.Clear
else
begin
ctx.saveGraphicsState;
CGContextSaveGState(CGContext());
FClipRegion.CombineWith(AClipRegion, Mode);
FClipRegion.Apply(Self);
FClipped := True;
@ -1504,7 +1507,7 @@ begin
if FClipped then
begin
ctx.saveGraphicsState;
CGContextSaveGState(CGContext());
FClipRegion.Apply(Self);
end;
end;
@ -1532,7 +1535,7 @@ begin
if FClipped then
begin
ctx.saveGraphicsState;
CGContextSaveGState(CGContext());
FClipRegion.Apply(Self);
end;
end;
@ -1789,7 +1792,7 @@ procedure TCocoaContext.TextOut(X, Y: Integer; Options: Longint; Rect: PRect; UT
var
BrushSolid, FillBg: Boolean;
begin
ctx.saveGraphicsState;
CGContextSaveGState(CGContext());
if Assigned(Rect) then
begin
@ -1821,7 +1824,7 @@ begin
FText.Draw(ctx, X, Y, FillBg, CharsDelta);
end;
ctx.restoreGraphicsState;
CGContextRestoreGState(CGContext());
end;
procedure TCocoaContext.Frame(const R: TRect);
@ -1922,7 +1925,7 @@ begin
if FClipped then
begin
Trans := CGContextGetCTM(CGContext);
ctx.RestoreGraphicsState;
CGContextRestoreGState(CGContext());
ApplyTransform(Trans);
end;
end;

1
lcl/interfaces/cocoa/cocoawinapi.inc
View File

@ -2299,7 +2299,6 @@ begin
if Result = 1 then
NSObject(Handle).lclScreenToLocal(P.X, P.Y);
end;
function TCocoaWidgetSet.SelectClipRGN(DC: hDC; RGN: HRGN): Longint;