paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 10:39:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-GTK3: Refactor code for GetPixel. Remove unused code. Issue #36472, patch from CudaText man.

Browse Source 
git-svn-id: trunk@62509 -
This commit is contained in:
juha 2020-01-07 23:16:24 +00:00
parent df5a5388d8
commit 024bfa3ac1
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/gtk3/gtk3object.inc
View File

@ -589,21 +589,11 @@ begin
end; end;
function TGtk3WidgetSet.DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor; function TGtk3WidgetSet.DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor;
var
pixbuf: PGdkPixbuf;
pixels: pointer;
begin begin
Result := 0;
if IsValidDC(CanvasHandle) then if IsValidDC(CanvasHandle) then
begin Result := TGtk3DeviceContext(CanvasHandle).getPixel(X, Y)
pixbuf := gdk_pixbuf_get_from_surface(TGtk3DeviceContext(CanvasHandle).CairoSurface, X, Y, 1, 1); else
if Assigned(pixbuf) then Result := 0;
begin
pixels := gdk_pixbuf_get_pixels(pixbuf);
if Assigned(pixels) then
Result := PLongInt(pixels)^ and $FFFFFF; // take first 3 bytes at pixels^
end;
end;
end; end;
procedure TGtk3WidgetSet.DCSetPixel(CanvasHandle: HDC; X, Y: Integer; AColor: TGraphicsColor); procedure TGtk3WidgetSet.DCSetPixel(CanvasHandle: HDC; X, Y: Integer; AColor: TGraphicsColor);

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

@ -217,11 +217,11 @@ type
procedure DeleteObjects; procedure DeleteObjects;
public public
procedure drawPixel(x, y: Integer; AColor: TColor); procedure drawPixel(x, y: Integer; AColor: TColor);
function getPixel(x, y: Integer): TColor;
procedure drawRect(x1, y1, w, h: Integer; const AFill, ABorder: Boolean); procedure drawRect(x1, y1, w, h: Integer; const AFill, ABorder: Boolean);
procedure drawRoundRect(x, y, w, h, rx, ry: Integer); procedure drawRoundRect(x, y, w, h, rx, ry: Integer);
procedure drawText(x: Integer; y: Integer; const s: String); overload; procedure drawText(x: Integer; y: Integer; const s: String); overload;
procedure drawText(x,y,w,h,flags: Integer; const s: String); overload; procedure drawText(x,y,w,h,flags: Integer; const s: String); overload;
procedure drawLine(x1: Integer; y1: Integer; x2: Integer; y2: Integer);
procedure drawEllipse(x, y, w, h: Integer; AFill, ABorder: Boolean); procedure drawEllipse(x, y, w, h: Integer; AFill, ABorder: Boolean);
procedure drawSurface(targetRect: PRect; Surface: Pcairo_surface_t; sourceRect: PRect; procedure drawSurface(targetRect: PRect; Surface: Pcairo_surface_t; sourceRect: PRect;
mask: PGdkPixBuf; maskRect: PRect); mask: PGdkPixBuf; maskRect: PRect);
@ -1225,6 +1225,21 @@ begin
cairo_stroke(Widget); cairo_stroke(Widget);
end; end;
function TGtk3DeviceContext.getPixel(x, y: Integer): TColor;
var
pixbuf: PGdkPixbuf;
pixels: pointer;
begin
Result := 0;
pixbuf := gdk_pixbuf_get_from_surface(CairoSurface, X, Y, 1, 1);
if Assigned(pixbuf) then
begin
pixels := gdk_pixbuf_get_pixels(pixbuf);
if Assigned(pixels) then
Result := PLongInt(pixels)^ and $FFFFFF; // take first 3 bytes at pixels^
end;
end;
procedure TGtk3DeviceContext.drawRect(x1, y1, w, h: Integer; const AFill, ABorder: Boolean); procedure TGtk3DeviceContext.drawRect(x1, y1, w, h: Integer; const AFill, ABorder: Boolean);
begin begin
cairo_save(Widget); cairo_save(Widget);
@ -1314,14 +1329,6 @@ begin
end; end;
end; end;
procedure TGtk3DeviceContext.drawLine(x1: Integer; y1: Integer; x2: Integer;
y2: Integer);
begin
ApplyPen;
cairo_move_to(Widget, x1, y1);
cairo_line_to(Widget, x2, y2);
end;
procedure TGtk3DeviceContext.drawEllipse(x, y, w, h: Integer; AFill, ABorder: Boolean); procedure TGtk3DeviceContext.drawEllipse(x, y, w, h: Integer; AFill, ABorder: Boolean);
var var
save_matrix:cairo_matrix_t; save_matrix:cairo_matrix_t;