pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-06-12 22:07:39 +02:00
Code Issues Actions Releases Activity

Added partial GTK3 support

Browse Source 
Converted the OSRExternalPumpBrowser demo to GTK3
Converted the TinyBrowser demo to GTK3
Converted the TinyBrowser2 demo to GTK3
Moved all Lazarus demos for Linux to the Lazarus_Linux_GTK2 directory
Fixed the Copy.CEF.DLLs tool thanks to fraurino
This commit is contained in:
salvadordf
2022-06-25 16:41:34 +02:00
parent 1afd635484
commit 7f3e3415ef
141 changed files with 3689 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/uCEFMiscFunctions.pas
View File

@ -72,9 +72,11 @@ uses
{$IFDEF LINUX}{$IFDEF FPC}
ctypes, keysym, xf86keysym, x, xlib,
{$IFDEF LCLGTK2}gtk2, glib2, gdk2, gtk2proc, gtk2int, Gtk2Def, gdk2x, Gtk2Extra,{$ENDIF}
{$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGLib2, gtk3widgets,{$ENDIF}
{$ENDIF}{$ENDIF}
{$ENDIF}
uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFResourceHandler, uCEFConstants;
uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFResourceHandler,
{$IFDEF LINUX}{$IFDEF FPC}uCEFLinuxFunctions,{$ENDIF}{$ENDIF} uCEFConstants;
const
Kernel32DLL = 'kernel32.dll';
@ -856,11 +858,18 @@ procedure WindowInfoAsChild(var aWindowInfo : TCefWindowInfo; aParent : TCefWind
var
TempParent : TCefWindowHandle;
begin
// TODO: Find a way to get the right "parent_window" in FMX
TempParent := aParent;
{$IFDEF FPC}
if ValidCefWindowHandle(aParent) and (PGtkWidget(aParent)^.window <> nil) then
TempParent := gdk_window_xwindow(PGtkWidget(aParent)^.window);
{$IFDEF LCLGTK2}
if ValidCefWindowHandle(aParent) and (PGtkWidget(aParent)^.window <> nil) then
TempParent := gdk_window_xwindow(PGtkWidget(aParent)^.window);
{$ENDIF}
{$IFDEF LCLGTK3}
if ValidCefWindowHandle(aParent) and
(TGtk3Window(aParent).widget <> nil) and
(TGtk3Window(aParent).widget^.window <> nil)then
TempParent := gdk_x11_window_get_xid(TGtk3Window(aParent).widget^.window);
{$ENDIF}
{$ENDIF}
aWindowInfo.window_name := CefString(aWindowName);