mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-09 09:59:15 +02:00
cocoa: implement ETO_OPAQUE flag
git-svn-id: trunk@34388 -
This commit is contained in:
paul
parent
e1522769f7
commit
daea252a34
@ -270,13 +270,15 @@ type
|
||||
|
||||
TCocoaTextLayout = class
|
||||
strict private
|
||||
FColor: TColor;
|
||||
FBackgroundColor: TColor;
|
||||
FForegroundColor: TColor;
|
||||
FLayout: NSLayoutManager;
|
||||
FTextStorage: NSTextStorage;
|
||||
FTextContainer: NSTextContainer;
|
||||
FText: String;
|
||||
FFont: TCocoaFont;
|
||||
procedure SetColor(AValue: TColor);
|
||||
procedure SetBackgoundColor(AValue: TColor);
|
||||
procedure SetForegoundColor(AValue: TColor);
|
||||
procedure SetFont(AFont: TCocoaFont);
|
||||
procedure UpdateFont;
|
||||
procedure UpdateColor;
|
||||
@ -286,10 +288,11 @@ type
|
||||
destructor Destroy; override;
|
||||
procedure SetText(UTF8Text: PChar; ByteSize: Integer);
|
||||
function GetSize: TSize;
|
||||
procedure Draw(ctx: NSGraphicsContext; X, Y: Integer; DX: PInteger);
|
||||
procedure Draw(ctx: NSGraphicsContext; X, Y: Integer; FillBackground: Boolean; DX: PInteger);
|
||||
|
||||
property Font: TCocoaFont read FFont write SetFont;
|
||||
property ForegroundColor: TColor read FColor write SetColor;
|
||||
property BackgroundColor: TColor read FBackgroundColor write SetBackgoundColor;
|
||||
property ForegroundColor: TColor read FForegroundColor write SetForegoundColor;
|
||||
end;
|
||||
|
||||
{ TCocoaContext }
|
||||
@ -345,7 +348,7 @@ type
|
||||
procedure Polyline(const Points: array of TPoint; NumPts: Integer);
|
||||
procedure Rectangle(X1, Y1, X2, Y2: Integer; FillRect: Boolean; UseBrush: TCocoaBrush);
|
||||
procedure Ellipse(X1, Y1, X2, Y2: Integer);
|
||||
procedure TextOut(X,Y: Integer; UTF8Chars: PChar; Count: Integer; CharsDelta: PInteger);
|
||||
procedure TextOut(X, Y: Integer; Options: Longint; Rect: PRect; UTF8Chars: PChar; Count: Integer; CharsDelta: PInteger);
|
||||
procedure Frame(const R: TRect);
|
||||
procedure Frame3d(var ARect: TRect; const FrameWidth: integer; const Style: TBevelCut);
|
||||
procedure FrameRect(const ARect: TRect; const ABrush: TCocoaBrush);
|
||||
@ -835,7 +838,8 @@ end;
|
||||
|
||||
procedure TCocoaTextLayout.UpdateColor;
|
||||
begin
|
||||
FTextStorage.addAttribute_value_range(NSForegroundColorAttributeName, ColorToNSColor(FColor), GetTextRange);
|
||||
FTextStorage.addAttribute_value_range(NSForegroundColorAttributeName, ColorToNSColor(ForegroundColor), GetTextRange);
|
||||
FTextStorage.addAttribute_value_range(NSBackgroundColorAttributeName, ColorToNSColor(BackgroundColor), GetTextRange);
|
||||
end;
|
||||
|
||||
function TCocoaTextLayout.GetTextRange: NSRange;
|
||||
@ -844,11 +848,22 @@ begin
|
||||
Result.length := FTextStorage.length;
|
||||
end;
|
||||
|
||||
procedure TCocoaTextLayout.SetColor(AValue: TColor);
|
||||
procedure TCocoaTextLayout.SetForegoundColor(AValue: TColor);
|
||||
begin
|
||||
if FColor <> AValue then
|
||||
if FForegroundColor <> AValue then
|
||||
begin
|
||||
FColor := AValue;
|
||||
FForegroundColor := AValue;
|
||||
FTextStorage.beginEditing;
|
||||
UpdateColor;
|
||||
FTextStorage.endEditing;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCocoaTextLayout.SetBackgoundColor(AValue: TColor);
|
||||
begin
|
||||
if FBackgroundColor <> AValue then
|
||||
begin
|
||||
FBackgroundColor := AValue;
|
||||
FTextStorage.beginEditing;
|
||||
UpdateColor;
|
||||
FTextStorage.endEditing;
|
||||
@ -870,6 +885,9 @@ begin
|
||||
FLayout.release;
|
||||
FFont := DefaultFont;
|
||||
FFont.AddRef;
|
||||
FText := '';
|
||||
FBackgroundColor := clWhite;
|
||||
FForegroundColor := clBlack;
|
||||
end;
|
||||
|
||||
destructor TCocoaTextLayout.Destroy;
|
||||
@ -924,7 +942,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TCocoaTextLayout.Draw(ctx: NSGraphicsContext; X, Y: Integer; DX: PInteger);
|
||||
procedure TCocoaTextLayout.Draw(ctx: NSGraphicsContext; X, Y: Integer; FillBackground: Boolean; DX: PInteger);
|
||||
var
|
||||
Range: NSRange;
|
||||
Pt: NSPoint;
|
||||
@ -939,6 +957,8 @@ begin
|
||||
Range := FLayout.glyphRangeForTextContainer(FTextContainer);
|
||||
Pt.x := X;
|
||||
Pt.y := Y;
|
||||
if FillBackground then
|
||||
FLayout.drawBackgroundForGlyphRange_atPoint(Range, Pt);
|
||||
FLayout.drawGlyphsForGlyphRange_atPoint(Range, Pt);
|
||||
end;
|
||||
|
||||
@ -1359,7 +1379,7 @@ begin
|
||||
CGContextStrokePath(cg);
|
||||
end;
|
||||
|
||||
procedure TCocoaContext.Rectangle(X1,Y1,X2,Y2:Integer;FillRect:Boolean; UseBrush: TCocoaBrush);
|
||||
procedure TCocoaContext.Rectangle(X1, Y1, X2, Y2: Integer; FillRect: Boolean; UseBrush: TCocoaBrush);
|
||||
var
|
||||
cg: CGContextRef;
|
||||
begin
|
||||
@ -1396,13 +1416,30 @@ begin
|
||||
CGContextDrawPath(CGContext, kCGPathFillStroke);
|
||||
end;
|
||||
|
||||
procedure TCocoaContext.TextOut(X, Y: Integer; UTF8Chars: PChar; Count: Integer; CharsDelta: PInteger);
|
||||
procedure TCocoaContext.TextOut(X, Y: Integer; Options: Longint; Rect: PRect; UTF8Chars: PChar; Count: Integer; CharsDelta: PInteger);
|
||||
var
|
||||
BrushSolid, FillBg: Boolean;
|
||||
begin
|
||||
ctx.saveGraphicsState;
|
||||
|
||||
// check flipped state
|
||||
if Assigned(Rect) then
|
||||
begin
|
||||
// fill background
|
||||
if (Options and ETO_OPAQUE) <> 0 then
|
||||
begin
|
||||
BrushSolid := BkBrush.Solid;
|
||||
BkBrush.Solid := True;
|
||||
with Rect^ do
|
||||
Rectangle(Left, Top, Right, Bottom, True, BkBrush);
|
||||
BkBrush.Solid := BrushSolid;
|
||||
end;
|
||||
end;
|
||||
|
||||
FillBg := not Assigned(Rect) and ((Options and ETO_OPAQUE) <> 0);
|
||||
if FillBg then
|
||||
FText.BackgroundColor := BkBrush.ColorRef;
|
||||
FText.SetText(UTF8Chars, Count);
|
||||
FText.Draw(ctx, X, Y, CharsDelta);
|
||||
FText.Draw(ctx, X, Y, FillBg, CharsDelta);
|
||||
|
||||
ctx.restoreGraphicsState;
|
||||
end;
|
||||
|
||||
@ -417,12 +417,12 @@ end;
|
||||
function TCocoaWidgetSet.ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint;
|
||||
Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean;
|
||||
var
|
||||
ctx : TCocoaContext;
|
||||
ctx: TCocoaContext;
|
||||
begin
|
||||
ctx:=CheckDC(DC);
|
||||
Result:=Assigned(ctx);
|
||||
if not Assigned(ctx) then Exit;
|
||||
ctx.TextOut(X,Y, Str, Count, Dx);
|
||||
ctx := CheckDC(DC);
|
||||
Result := Assigned(ctx);
|
||||
if Assigned(ctx) then
|
||||
ctx.TextOut(X, Y, Options, Rect, Str, Count, Dx);
|
||||
end;
|
||||
|
||||
function TCocoaWidgetSet.FillRect(DC: HDC; const Rect: TRect; Brush: HBRUSH): Boolean;
|
||||
@ -1670,9 +1670,9 @@ begin
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
function TCocoaWidgetSet.TextOut(DC: HDC; X,Y : Integer; Str : Pchar; Count: Integer) : Boolean;
|
||||
function TCocoaWidgetSet.TextOut(DC: HDC; X,Y: Integer; Str: Pchar; Count: Integer) : Boolean;
|
||||
begin
|
||||
Result:=ExtTextOut(DC, X, Y, 0, nil, Str, Count, nil);
|
||||
Result := ExtTextOut(DC, X, Y, 0, nil, Str, Count, nil);
|
||||
end;
|
||||
|
||||
function TCocoaWidgetSet.SaveDC(DC: HDC): Integer;
|
||||
|
||||
@ -189,7 +189,7 @@ function StretchMaskBlt(DestDC: HDC; X, Y, Width, Height: Integer;
|
||||
XMask, YMask: Integer; Rop: DWORD): Boolean; override;
|
||||
{function SystemParametersInfo(uiAction: DWord; uiParam: DWord; pvParam: Pointer; fWinIni: DWord): LongBool; override;}
|
||||
|
||||
function TextOut(DC: HDC; X,Y : Integer; Str : Pchar; Count: Integer) : Boolean; override;
|
||||
function TextOut(DC: HDC; X,Y: Integer; Str: Pchar; Count: Integer) : Boolean; override;
|
||||
function UpdateWindow(Handle: HWND): Boolean; override;
|
||||
{function WindowFromPoint(Point: TPoint): HWND; override;}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user