diff --git a/README.md b/README.md index 69b527d4..4e656445 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the LICENSE.md file. -CEF4Delphi uses CEF 139.0.28 which includes Chromium 139.0.7258.139. +CEF4Delphi uses CEF 139.0.30 which includes Chromium 139.0.7258.139. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.28%2Bg55ab8a8%2Bchromium-139.0.7258.139_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.28%2Bg55ab8a8%2Bchromium-139.0.7258.139_windows64.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.28%2Bg55ab8a8%2Bchromium-139.0.7258.139_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.28%2Bg55ab8a8%2Bchromium-139.0.7258.139_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.28%2Bg55ab8a8%2Bchromium-139.0.7258.139_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.28%2Bg55ab8a8%2Bchromium-139.0.7258.139_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.30%2Bgd4551db%2Bchromium-139.0.7258.139_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.30%2Bgd4551db%2Bchromium-139.0.7258.139_windows64.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.30%2Bgd4551db%2Bchromium-139.0.7258.139_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.30%2Bgd4551db%2Bchromium-139.0.7258.139_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.30%2Bgd4551db%2Bchromium-139.0.7258.139_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_139.0.30%2Bgd4551db%2Bchromium-139.0.7258.139_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 12.3 and it has been tested in Delphi 6, Delphi XE, Delphi 10, Delphi 11 and Lazarus 4.2/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 553b0e3a..1842c10e 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFLinkedWinControlBase.pas b/source/uCEFLinkedWinControlBase.pas index 71020677..72c6672c 100644 --- a/source/uCEFLinkedWinControlBase.pas +++ b/source/uCEFLinkedWinControlBase.pas @@ -47,6 +47,9 @@ type {$IFDEF MSWINDOWS} procedure WndProc(var aMessage: TMessage); override; {$ENDIF} + {$IFDEF LCLGTK3} + procedure Paint; override; + {$ENDIF} /// /// TChromium instance used by this component. /// @@ -73,6 +76,13 @@ begin {$IFDEF MSWINDOWS} FUseSetFocus := True; {$ENDIF} + {$IFDEF LCLGTK3} + BevelOuter := bvNone; + BevelWidth := 0; + Caption := ''; + ControlStyle := ControlStyle - [csNoFocus]; + TabStop := True; + {$ENDIF} end; {$IFDEF MSWINDOWS} @@ -87,6 +97,14 @@ begin end; {$ENDIF} +{$IFDEF LCLGTK3} +procedure TCEFLinkedWinControlBase.Paint; +begin + if (Chromium = nil) or not(Chromium.Initialized) then + inherited Paint; +end; +{$ENDIF} + {$IFDEF FPC} procedure TCEFLinkedWinControlBase.SetVisible(Value: Boolean); {$IFDEF LINUX} @@ -178,11 +196,11 @@ begin (Chromium <> nil) and Chromium.Initialized then begin - TempPoint.x:= 0; - TempPoint.y:= 0; + TempPoint.x := 0; + TempPoint.y := 0; NSView(Chromium.WindowHandle).setFrameOrigin(TempPoint); - TempSize.width:= Width; - TempSize.height:= Height; + TempSize.width := Width; + TempSize.height := Height; NSView(Chromium.WindowHandle).setFrameSize(TempSize); end; {$ENDIF} diff --git a/source/uCEFVersion.inc b/source/uCEFVersion.inc index 71871698..a2c4308c 100644 --- a/source/uCEFVersion.inc +++ b/source/uCEFVersion.inc @@ -1,6 +1,6 @@ CEF_SUPPORTED_VERSION_MAJOR = 139; CEF_SUPPORTED_VERSION_MINOR = 0; - CEF_SUPPORTED_VERSION_RELEASE = 28; + CEF_SUPPORTED_VERSION_RELEASE = 30; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = CEF_SUPPORTED_VERSION_MAJOR; diff --git a/source/uCEFWinControl.pas b/source/uCEFWinControl.pas index 8c3b5d53..4e6a2346 100644 --- a/source/uCEFWinControl.pas +++ b/source/uCEFWinControl.pas @@ -19,6 +19,7 @@ uses {$IFDEF MSWINDOWS}WinApi.Windows, {$ENDIF} System.Classes, Vcl.Controls, Vcl.Graphics, {$ELSE} {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics, + {$IFDEF LCLGTK3}ExtCtrls,{$ENDIF} {$IFDEF FPC} LCLProc, LCLType, LCLIntf, LResources, InterfaceBase, {$ENDIF} @@ -32,7 +33,7 @@ type /// /// Custom TWinControl used by CEF browsers. /// - TCEFWinControl = class(TWinControl) + TCEFWinControl = class({$IFDEF LCLGTK3}TCustomPanel{$ELSE}TWinControl{$ENDIF}) protected function GetChildWindowHandle : {$IFNDEF MSWINDOWS}{$IFDEF FPC}LclType.{$ENDIF}{$ENDIF}THandle; virtual; procedure Resize; override; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index ea61ed75..003b28b1 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 774, + "InternalVersion" : 775, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "139.0.28" + "Version" : "139.0.30" } ], "UpdatePackageData" : {