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

Gtk3: Encapsulated PGdkCursor, fixed CreateCompatibleDC().

Browse Source
This commit is contained in:
zeljan1 2025-02-06 23:06:19 +01:00
parent 6c2cd439b7
commit 8cece17ba8
5 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,7 +694,8 @@ begin
CursorValue := GDK_CURSOR_IS_PIXMAP;
end;
if CursorValue <> GDK_CURSOR_IS_PIXMAP then
Result := HCURSOR({%H-}PtrUInt(gdk_cursor_new(CursorValue)));
Result := HCURSOR(TGtk3Cursor.Create(CursorValue));
// HCURSOR({%H-}PtrUInt(gdk_cursor_new(CursorValue)));
end;
function TGtk3WidgetSet.DCGetPixel(CanvasHandle: HDC; X, Y: integer): TGraphicsColor;

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

@ -190,6 +190,7 @@ type
constructor Create(ACur:integer); overload;
constructor Create(pixbuf:PGdkPixbuf;x,y:gint); overload;
constructor Create(img:TGtk3Image); overload;
constructor Create(ACur: TGdkCursorType); overload;
destructor Destroy; override;
property Handle:PGdkCursor read fHandle;
end;
@ -248,8 +249,8 @@ type
public
CairoSurface: Pcairo_surface_t;
Parent: PGtkWidget;
Window: PGdkWindow;
ParentPixmap: PGdkPixbuf;
Window: PGdkWindow;
fncOrigin:TPoint; // non-client area offsets surface origin
constructor Create(AWidget: PGtkWidget; const APaintEvent: Boolean = False); virtual;
constructor Create(AWindow: PGdkWindow; const APaintEvent: Boolean); virtual;
@ -655,8 +656,9 @@ end;
constructor TGtk3Cursor.Create(ACur:integer);
var gdk_cur: TGdkCursorType;
begin
inherited Create;
case ACur of
crArrow: gdk_cur:=GDK_ARROW;
crArrow: gdk_cur:=GDK_ARROW;
else
gdk_cur:=GDK_ARROW;
end;
@ -664,23 +666,27 @@ begin
Fhandle:=TGdkCursor.new_for_display(gdk_display_get_default, gdk_cur);
end;
constructor TGtk3Cursor.Create(pixbuf: PGdkPixbuf;x,y:gint);
constructor TGtk3Cursor.Create(pixbuf: PGdkPixbuf; x,y:gint);
begin
fHandle:=TGdkCursor.new_from_pixbuf(TGdkDisplay.get_default(),pixbuf,x,y);
inherited Create;
FHandle := TGdkCursor.new_from_pixbuf(TGdkDisplay.get_default(),pixbuf,x,y);
end;
constructor TGtk3Cursor.Create(img: TGtk3Image);
var w,h:gint;
begin
inherited Create;
w:=img.width;
h:=img.height;
Create(img.Handle,w,h);
FHandle := TGdkCursor.new_from_pixbuf(TGdkDisplay.get_default(),img.Handle, img.Width, img.Height);
end;
constructor TGtk3Cursor.Create(ACur: TGdkCursorType);
begin
inherited Create;
FHandle := gdk_cursor_new(ACur);
end;
destructor TGtk3Cursor.Destroy;
begin
PGdkCursor(fHandle)^.unref();
FHandle^.unref;
inherited Destroy;
end;
@ -959,6 +965,7 @@ var
AttrList: PPangoAttrList;
Attr: PPangoAttribute;
begin
inherited Create;
FLogFont := ALogFont;
FFontName := ALogFont.lfFaceName;
AContext := gdk_pango_context_get;
@ -1125,6 +1132,7 @@ begin
{$IFDEF VerboseGtk3DeviceContext}
DebugLn('TGtk3Image.Create 3 AData=',dbgs(AData <> nil),' format=',dbgs(Ord(format)),' w=',dbgs(width),' h=',dbgs(height),' dataowner=',dbgs(ADataOwner));
{$ENDIF}
inherited Create;
FFormat := format;
FData := AData;
FDataOwner := ADataOwner;
@ -1809,12 +1817,9 @@ begin
FDCSaveCounter := 0;
if AWidget = nil then
begin
ACairo := gdk_cairo_create(gdk_get_default_root_window);
gdk_cairo_get_clip_rectangle(ACairo, @ARect);
cairo_destroy(ACairo);
CairoSurface := cairo_image_surface_create(CAIRO_FORMAT_ARGB32, ARect.width, ARect.height);
//no need for ParentPixmap, this is Mem DC.
CairoSurface := cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 10, 10);
FCairo := cairo_create(CairoSurface);
ParentPixmap := gdk_pixbuf_get_from_surface(CairoSurface, 0, 0, ARect.width, ARect.height);
FOwnsSurface := True;
end else
begin
@ -2169,12 +2174,13 @@ begin
if aPixBuf <> nil then
begin
aPixBuf^.ref;
//this fixes problem with some images being R & B swapped when blitted onto dest.
if (cairo_surface_get_type(CairoSurface) <> cairo_surface_get_type(Surface)) and
(g_object_get_data(aPixBuf,'lcl_color_swap') <> nil) then
begin
SwapRedBlueChannels(aPixBuf);
gdk_cairo_set_source_pixbuf(pcr, aPixBuf, 0, 0)
gdk_cairo_set_source_pixbuf(pcr, aPixBuf, 0, 0);
end else
begin
if g_object_get_data(aPixBuf,'lcl_no_color_swap') <> nil then
@ -2182,6 +2188,7 @@ begin
else
cairo_set_source_surface(pcr, Surface, 0, 0);
end;
aPixBuf^.unref;
end else
cairo_set_source_surface(pcr, Surface, 0, 0);
@ -2227,7 +2234,6 @@ begin
{$ENDIF}
cairo_set_operator(pcr, CAIRO_OPERATOR_OVER);
gdk_cairo_set_source_pixbuf(pcr, Image, 0, 0);
with targetRect^ do

15
lcl/interfaces/gtk3/gtk3procs.pas
View File

@ -349,7 +349,7 @@ function GetStyleWidget(aStyle: TLazGtkStyle): PGtkWidget;
procedure ReleaseAllStyles;
implementation
uses LCLProc;
uses LCLProc, gtk3objects;
function PANGO_PIXELS(d:integer):integer;
begin
@ -1344,16 +1344,21 @@ var
TopList: PGList;
List: PGList;
Window: PGdkWindow;
ACursorHandle: HCURSOR;
begin
if Cursor > 0 then
ACursorHandle := HCURSOR(TGtk3Cursor(Cursor).Handle)
else
ACursorHandle := 0;
TopList := gdk_screen_get_toplevel_windows(gdk_screen_get_default);
if TopList = nil then
exit;
List := TopList;
while Assigned(List) do begin
while Assigned(List) do
begin
Window := List^.Data;
if Assigned(Window) then begin
SetWindowCursor(Window, Cursor, True, False);
end;
if Assigned(Window) then
SetWindowCursor(Window, ACursorHandle, True, False);
List := List^.Next;
end;
g_list_free(TopList);

4
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -3352,10 +3352,10 @@ begin
if IsWidgetOk then
begin
if GetContainerWidget^.get_has_window and Gtk3IsGdkWindow(GetContainerWidget^.window) then
SetWindowCursor(GetContainerWidget^.window, ACursor, False, True)
SetWindowCursor(GetContainerWidget^.window, HCURSOR(TGtk3Cursor(ACursor).Handle), False, True)
else
if Widget^.get_has_window and Gtk3IsGdkWindow(Widget^.window) then
SetWindowCursor(Widget^.window, ACursor, False, True)
SetWindowCursor(Widget^.window, HCURSOR(TGtk3Cursor(ACursor).Handle), False, True)
else // fallback for window-less widgets
if Assigned(self.getParent) then
Self.getParent.SetCursor(ACursor);

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

@ -416,8 +416,9 @@ begin
Result := HICON(TGtk3Image.Create(TGtk3Image(IconInfo^.hbmColor).Handle));
end else
begin
Result := HCURSOR({%H-}PtrUInt(gdk_cursor_new_from_pixbuf(gdk_display_get_default,
TGtk3Image(IconInfo^.hbmColor).Handle, IconInfo^.xHotSpot, IconInfo^.yHotSpot)));
Result := HCURSOR(TGtk3Cursor.Create(TGtk3Image(IconInfo^.hbmColor).Handle, IconInfo^.xHotSpot, IconInfo^.yHotSpot));
//HCURSOR({%H-}PtrUInt(gdk_cursor_new_from_pixbuf(gdk_display_get_default,
// TGtk3Image(IconInfo^.hbmColor).Handle, IconInfo^.xHotSpot, IconInfo^.yHotSpot)));
// create cursor from pixbuf
{ W := gdk_pixbuf_get_width(TGtk3Image(IconInfo^.hbmColor).Handle);
H := gdk_pixbuf_get_height(TGtk3Image(IconInfo^.hbmColor).Handle);
@ -554,18 +555,18 @@ function TGtk3WidgetSet.DestroyCursor(Handle: HCURSOR): Boolean;
begin
Result := Handle <> 0;
if Result then
g_object_unref(PGdkCursor(Handle));
// gdk_cursor_destroy({%H-}PGdkCursor(Handle));
TGtk3Cursor(Handle).Free;
end;
function TGtk3WidgetSet.DestroyIcon(Handle: HICON): Boolean;
begin
Result := False;
if IsValidGDIObject(Handle) then
begin
TGtk3Image(Handle).Free;
Result := True;
end;
Result := (Handle <> 0) and
(
(TGtk3Object(Handle) is TGtk3Image) or
(TGtk3Object(Handle) is TGtk3Cursor)
);
if Result then
TGtk3Object(Handle).Free;
end;
function TGtk3WidgetSet.DPtoLP(DC: HDC; var Points; Count: Integer): BOOL;
@ -4509,7 +4510,7 @@ begin
ATargetRect := Rect(X, Y, Width + X, Height + Y);
ASrcRect := Rect(XSrc, YSrc, SrcWidth + XSrc, SrcHeight + YSrc);
if (mask<>0) then
DestContext.drawImage1(@ATargetRect, PgdkPixbuf(SrcContext.CurrentImage.Handle) , @ASrcRect, nil, nil)
DestContext.drawImage1(@ATargetRect, SrcContext.CurrentImage.Handle , @ASrcRect, nil, nil)
else
begin
if (cairo_surface_get_type(SrcContext.CairoSurface) = CAIRO_SURFACE_TYPE_IMAGE) and