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

cocoa: fix drawing of empty text

Browse Source 
git-svn-id: trunk@41796 -
This commit is contained in:
paul 2013-06-22 12:51:39 +00:00
parent e9d31145a5
commit da9bdae897
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

@ -1037,9 +1037,6 @@ var
Indexes: array of NSUInteger; Indexes: array of NSUInteger;
I, Count: NSUInteger; I, Count: NSUInteger;
begin begin
// ToDo: empty text: draw background of given rect
if FText = '' then
Exit;
if not ctx.isFlipped then if not ctx.isFlipped then
Context := NSGraphicsContext.graphicsContextWithGraphicsPort_flipped(ctx.graphicsPort, True) Context := NSGraphicsContext.graphicsContextWithGraphicsPort_flipped(ctx.graphicsPort, True)
else else
@ -1617,7 +1614,7 @@ begin
BkBrush.Solid := BrushSolid; BkBrush.Solid := BrushSolid;
end; end;
if (Options and ETO_CLIPPED) <> 0 then if ((Options and ETO_CLIPPED) <> 0) and (Count > 0) then
begin begin
CGContextBeginPath(CGContext); CGContextBeginPath(CGContext);
CGContextAddRect(CGContext, RectToCGrect(Rect^)); CGContextAddRect(CGContext, RectToCGrect(Rect^));
@ -1625,11 +1622,14 @@ begin
end; end;
end; end;
FillBg := BkMode = OPAQUE; if (Count > 0) then
if FillBg then begin
FText.BackgroundColor := BkBrush.ColorRef; FillBg := BkMode = OPAQUE;
FText.SetText(UTF8Chars, Count); if FillBg then
FText.Draw(ctx, X, Y, FillBg, CharsDelta); FText.BackgroundColor := BkBrush.ColorRef;
FText.SetText(UTF8Chars, Count);
FText.Draw(ctx, X, Y, FillBg, CharsDelta);
end;
ctx.restoreGraphicsState; ctx.restoreGraphicsState;
end; end;