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

gtk3: implemented TGtk3WidgetSet.FrameRect()

Browse Source 
git-svn-id: trunk@46653 -
This commit is contained in:
zeljko 2014-10-23 16:37:27 +00:00
parent 2bffa65585
commit 3f2a9e3b49
2 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lcl/interfaces/gtk3/gtk3objects.pas
View File

@ -95,6 +95,7 @@ type
FCosmetic: Boolean;
FEndCap: TPenEndCap;
FJoinStyle: TPenJoinStyle;
FPenMode: TPenMode;
FStyle: TFPPenStyle;
FWidth: Integer;
FColor: TColor;
@ -106,6 +107,7 @@ type
procedure setCosmetic(b: Boolean);
procedure SetEndCap(AValue: TPenEndCap);
procedure SetJoinStyle(AValue: TPenJoinStyle);
procedure SetPenMode(AValue: TPenMode);
procedure SetStyle(AValue: TFPPenStyle);
procedure setWidth(p1: Integer);
public
@ -118,6 +120,7 @@ type
property EndCap: TPenEndCap read FEndCap write SetEndCap;
property IsExtPen: Boolean read FIsExtPen write FIsExtPen;
property JoinStyle: TPenJoinStyle read FJoinStyle write SetJoinStyle;
property Mode: TPenMode read FPenMode write SetPenMode;
property Style: TFPPenStyle read FStyle write SetStyle;
property Width: Integer read GetWidth write SetWidth;
end;
@ -755,6 +758,12 @@ begin
FJoinStyle:=AValue;
end;
procedure TGtk3Pen.SetPenMode(AValue: TPenMode);
begin
if FPenMode=AValue then Exit;
FPenMode:=AValue;
end;
procedure TGtk3Pen.SetStyle(AValue: TFPPenStyle);
begin
FStyle := AValue;
@ -957,13 +966,47 @@ procedure TGtk3DeviceContext.ApplyPen;
end;
var
cap: cairo_line_cap_t;
w: Double;
begin
SetSourceColor(FCurrentPen.Color);
case FCurrentPen.Mode of
pmBlack: begin
SetSourceColor(clBlack);
cairo_set_operator(Widget, CAIRO_OPERATOR_OVER);
end;
pmWhite: begin
SetSourceColor(clWhite);
cairo_set_operator(Widget, CAIRO_OPERATOR_OVER);
end;
pmCopy: cairo_set_operator(Widget, CAIRO_OPERATOR_OVER);
pmXor: cairo_set_operator(Widget, CAIRO_OPERATOR_XOR);
pmNotXor: cairo_set_operator(Widget, CAIRO_OPERATOR_XOR);
{pmNop,
pmNot,
pmCopy,
pmNotCopy,
pmMergePenNot,
pmMaskPenNot,
pmMergeNotPen,
pmMaskNotPen,
pmMerge,
pmNotMerge,
pmMask,
pmNotMask,}
else
cairo_set_operator(Widget, CAIRO_OPERATOR_OVER);
end;
if FCurrentPen.Cosmetic then
cairo_set_line_width(Widget, 1.0)
else
cairo_set_line_width(Widget, FCurrentPen.Width {* ScaleX}); //line_width is diameter of the pen circle
begin
w := FCurrentPen.Width;
if w = 0 then
w := 0.5;
cairo_set_line_width(Widget, w {* ScaleX}); //line_width is diameter of the pen circle
end;
case FCurrentPen.Style of
psSolid: cairo_set_dash(Widget, nil, 0, 0);

14
lcl/interfaces/gtk3/gtk3winapi.inc
View File

@ -1663,11 +1663,21 @@ end;
function TGtk3WidgetSet.FrameRect(DC: HDC; const ARect: TRect; hBr: HBRUSH
): Integer;
var
cr: Pcairo_t;
begin
{$IFDEF GTK3DEBUGNOTIMPLEMENTED}
DebugLn('WARNING: TGtk3WidgetSet.FrameRect not implemented ...');
DebugLn('TGtk3WidgetSet.FrameRect ARect=',dbgs(ARect));
{$ENDIF}
Result := inherited FrameRect(DC, ARect, hBr);
Result := 0;
if not IsValidDC(DC) then
exit;
cr := TGtk3DeviceContext(DC).Widget;
cairo_rectangle(cr, ARect.Left, ARect.Top, ARect.Right-ARect.Left, ARect.Bottom-ARect.Top);
if IsValidGDIObject(hBr) then
TGtk3DeviceContext(DC).SetSourceColor(TGtk3Brush(HBR).Color);
cairo_set_line_width(cr, 1);
cairo_stroke(cr); //Don't touch
end;
function TGtk3WidgetSet.HideCaret(hWnd: HWND): Boolean;