paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 07:08:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gtk3: fixed fillRect() overload without brush. issue #41342

Browse Source
This commit is contained in:
zeljan1 2025-01-21 09:51:11 +01:00
parent ae834f5ddf
commit fe08ba3b2f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,6 +295,8 @@ type
procedure TranslateCairoToDevice;
procedure Translate(APoint: TPoint);
procedure set_antialiasing(aamode:boolean);
procedure Save;
procedure Restore;
property BkMode: integer read FBkMode write FBkMode;
property BkColor: TColorRef read GetBkColor write SetBkColor;
property BgBrush: TGtk3Brush read FBgBrush; {bgBrush is created when SetBk is called, otherwise is nil}
@ -2349,12 +2351,14 @@ begin
begin
ATempBrush := FCurrentBrush;
CurrentBrush:= TGtk3Brush(ABrush);
applyBrush;
end;
end else
ATempBrush := FCurrentBrush;
applyBrush;
cairo_rectangle(pcr, x + PixelOffset, y + PixelOffset, w - 1, h - 1);
if (ABrush <> 0) and (CurrentBrush.Style <> BS_NULL) then
if (CurrentBrush.Style <> BS_NULL) then
begin
cairo_fill_preserve(pcr);
// must paint border, filling is not enough
@ -2363,8 +2367,7 @@ begin
cairo_stroke(pcr);
end;
if ABrush <> 0 then
CurrentBrush:= ATempBrush;
CurrentBrush:= ATempBrush;
cairo_new_path(pcr);
finally
cairo_restore(pcr);
@ -2743,6 +2746,16 @@ begin
cairo_set_antialias(pcr, caa[aamode]);
end;
procedure TGtk3DeviceContext.Save;
begin
cairo_save(pcr);
end;
procedure TGtk3DeviceContext.Restore;
begin
cairo_restore(pcr);
end;
procedure TGtk3DeviceContext.SetCanvasScaleFactor(const AValue: double);
var
matrix: Tcairo_matrix_t;