paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-04 09:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

added implementation of gtk3 polygon

Browse Source 
git-svn-id: trunk@43698 -
This commit is contained in:
andrew 2014-01-11 03:36:49 +00:00
parent 2dd21044bd
commit 506ae4e51d
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -957,8 +957,8 @@ procedure TGtk3DeviceContext.ApplyPen;
var
cap: cairo_line_cap_t;
begin
SetSourceColor(FCurrentPen.Color);
if FCurrentPen.Cosmetic then
cairo_set_line_width(Widget, 1.0)
else
@ -1357,8 +1357,35 @@ end;
procedure TGtk3DeviceContext.drawPolygon(P: PPoint; NumPts: Integer;
FillRule: integer);
var
i: Integer;
const
PixelOffset = 0.5;
begin
cairo_save(Widget);
try
// first apply the fill because the line is drawn over the filled area after
applyBrush;
cairo_set_fill_rule(Widget, cairo_fill_rule_t(FillRule));
// + Offset is so the center of the pixel is used.
cairo_move_to(Widget, P[0].X+PixelOffset, P[0].Y+PixelOffset);
for i := 1 to NumPts-1 do
cairo_line_to(Widget, P[i].X+PixelOffset, P[i].Y+PixelOffset);
cairo_close_path(Widget);
cairo_fill_preserve(Widget);
// now draw the line
ApplyPen;
//cairo_set_antialias(widget, CAIRO_ANTIALIAS_SUBPIXEL);
cairo_move_to(Widget, P[0].X+PixelOffset, P[0].Y+PixelOffset);
for i := 1 to NumPts-1 do
cairo_line_to(Widget, P[i].X+PixelOffset, P[i].Y+PixelOffset);
cairo_close_path(Widget);
cairo_stroke_preserve(Widget);
finally
cairo_restore(Widget);
end;
end;
procedure TGtk3DeviceContext.eraseRect(ARect: PRect);

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

@ -3090,10 +3090,13 @@ end;
function TGtk3WidgetSet.Polygon(DC: HDC; Points: PPoint; NumPts: Integer;
Winding: boolean): boolean;
begin
{$IFDEF GTK3DEBUGNOTIMPLEMENTED}
DebugLn('WARNING: TGtk3WidgetSet.Polygon not implemented ...');
{$ENDIF}
Result:=inherited Polygon(DC, Points, NumPts, Winding);
if not IsValidDC(DC) then
exit(False);
if not Winding then // faster
TGtk3DeviceContext(DC).drawPolygon(Points, NumPts, ord(CAIRO_FILL_RULE_EVEN_ODD))
else
TGtk3DeviceContext(DC).drawPolygon(Points, NumPts, Ord(CAIRO_FILL_RULE_WINDING));
Result:= True;
end;
function TGtk3WidgetSet.Polyline(DC: HDC; Points: PPoint; NumPts: Integer