diff --git a/README.md b/README.md index 356da532..02327519 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ CEF4Delphi is an open source project created by Salvador D CEF4Delphi is based on DCEF3, made by Henri Gourvest. The original license of DCEF3 still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 75.0.8 which includes Chromium 75.0.3770.80. +CEF4Delphi uses CEF 75.0.11 which includes Chromium 75.0.3770.100. The CEF binaries used by CEF4Delphi are available for download at spotify : -* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_75.0.8%2Bg5da93a1%2Bchromium-75.0.3770.80_windows32.tar.bz2) -* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_75.0.8%2Bg5da93a1%2Bchromium-75.0.3770.80_windows64.tar.bz2) +* [32 bits](http://opensource.spotify.com/cefbuilds/cef_binary_75.0.11%2Bgf50b3c2%2Bchromium-75.0.3770.100_windows32.tar.bz2) +* [64 bits](http://opensource.spotify.com/cefbuilds/cef_binary_75.0.11%2Bgf50b3c2%2Bchromium-75.0.3770.100_windows64.tar.bz2) CEF4Delphi was developed and tested on Delphi 10.3 Rio and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2 and Lazarus 2.0.2/FPC 3.0.4. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dpr b/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dpr index 054bd6b0..525371c8 100644 --- a/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dpr +++ b/demos/Delphi_VCL/PopupBrowser/PopupBrowser.dpr @@ -58,10 +58,7 @@ uses {$SetPEFlags IMAGE_FILE_LARGE_ADDRESS_AWARE} begin - GlobalCEFApp := TCefApplication.Create; - GlobalCEFApp.WindowlessRenderingEnabled := True; - GlobalCEFApp.EnableHighDPISupport := True; - GlobalCEFApp.DisableFeatures := 'NetworkService'; + CreateGlobalCEFApp; if GlobalCEFApp.StartMainProcess then begin @@ -73,6 +70,5 @@ begin Application.Run; end; - GlobalCEFApp.Free; - GlobalCEFApp := nil; + DestroyGlobalCEFApp; end. diff --git a/demos/Delphi_VCL/PopupBrowser/uChildForm.pas b/demos/Delphi_VCL/PopupBrowser/uChildForm.pas index ecd9a53a..debd323c 100644 --- a/demos/Delphi_VCL/PopupBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/PopupBrowser/uChildForm.pas @@ -192,7 +192,7 @@ begin TempKeyEvent.focus_on_editable_field := ord(False); Chromium1.SendKeyEvent(@TempKeyEvent); - Handled := (Msg.wParam in [VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN, VK_TAB]); + Handled := True; end else Handled := False; @@ -236,7 +236,7 @@ begin TempKeyEvent.focus_on_editable_field := ord(False); Chromium1.SendKeyEvent(@TempKeyEvent); - Handled := (Msg.wParam = VK_TAB); + Handled := (Msg.wParam in [VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN, VK_TAB]); end else Handled := False; diff --git a/demos/Delphi_VCL/PopupBrowser/uMainForm.pas b/demos/Delphi_VCL/PopupBrowser/uMainForm.pas index b8e7f50f..d857b752 100644 --- a/demos/Delphi_VCL/PopupBrowser/uMainForm.pas +++ b/demos/Delphi_VCL/PopupBrowser/uMainForm.pas @@ -110,6 +110,8 @@ type var MainForm: TMainForm; +procedure CreateGlobalCEFApp; + implementation {$R *.dfm} @@ -142,6 +144,16 @@ uses // 3. TChromium.OnClose sends a CEFBROWSER_DESTROY message to destroy CEFWindowParent1 in the main thread, which triggers the TChromium.OnBeforeClose event. // 4. TChromium.OnBeforeClose sets FCanClose := True and sends WM_CLOSE to the form. +procedure CreateGlobalCEFApp; +begin + GlobalCEFApp := TCefApplication.Create; + GlobalCEFApp.WindowlessRenderingEnabled := True; + GlobalCEFApp.EnableHighDPISupport := True; + //GlobalCEFApp.DisableFeatures := 'NetworkService'; + //GlobalCEFApp.LogFile := 'debug.log'; + //GlobalCEFApp.LogSeverity := LOGSEVERITY_INFO; +end; + procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: Boolean); begin FClosingChildren := True; diff --git a/demos/Lazarus/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lps b/demos/Lazarus/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lps index 9f7251a4..71314ad0 100644 --- a/demos/Lazarus/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lps +++ b/demos/Lazarus/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lps @@ -22,8 +22,8 @@ - - + + @@ -53,109 +53,108 @@ - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -167,20 +166,16 @@ - + - - + + - + - - - - diff --git a/demos/Lazarus/PopupBrowser/PopupBrowser.lps b/demos/Lazarus/PopupBrowser/PopupBrowser.lps index 836d61cc..f36379d8 100644 --- a/demos/Lazarus/PopupBrowser/PopupBrowser.lps +++ b/demos/Lazarus/PopupBrowser/PopupBrowser.lps @@ -9,7 +9,7 @@ - + @@ -21,8 +21,9 @@ - - + + + @@ -34,9 +35,8 @@ - - + @@ -44,6 +44,7 @@ + @@ -55,7 +56,7 @@ - + @@ -112,6 +113,14 @@ + + + + + + + + diff --git a/demos/Lazarus/PopupBrowser/uMainForm.pas b/demos/Lazarus/PopupBrowser/uMainForm.pas index 93212bab..c687c415 100644 --- a/demos/Lazarus/PopupBrowser/uMainForm.pas +++ b/demos/Lazarus/PopupBrowser/uMainForm.pas @@ -147,7 +147,7 @@ begin GlobalCEFApp := TCefApplication.Create; GlobalCEFApp.WindowlessRenderingEnabled := True; GlobalCEFApp.EnableHighDPISupport := True; - GlobalCEFApp.DisableFeatures := 'NetworkService'; + //GlobalCEFApp.DisableFeatures := 'NetworkService'; end; procedure TMainForm.FormCloseQuery(Sender: TObject; var CanClose: Boolean); diff --git a/demos/Lazarus/SimpleOSRBrowser/SimpleOSRBrowser.lps b/demos/Lazarus/SimpleOSRBrowser/SimpleOSRBrowser.lps index 617f7642..72163e9a 100644 --- a/demos/Lazarus/SimpleOSRBrowser/SimpleOSRBrowser.lps +++ b/demos/Lazarus/SimpleOSRBrowser/SimpleOSRBrowser.lps @@ -10,7 +10,7 @@ - + @@ -38,8 +38,8 @@ - - + + @@ -229,7 +229,7 @@ - + @@ -250,6 +250,14 @@ + + + + + + + + diff --git a/packages/CEF4Delphi_FMX.res b/packages/CEF4Delphi_FMX.res index 391381f9..934cad87 100644 Binary files a/packages/CEF4Delphi_FMX.res and b/packages/CEF4Delphi_FMX.res differ diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index fc0fd045..8e313e1d 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas index 5cc3816b..37290a09 100644 --- a/source/uCEFApplication.pas +++ b/source/uCEFApplication.pas @@ -62,13 +62,13 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 75; CEF_SUPPORTED_VERSION_MINOR = 0; - CEF_SUPPORTED_VERSION_RELEASE = 8; + CEF_SUPPORTED_VERSION_RELEASE = 11; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 75; CEF_CHROMEELF_VERSION_MINOR = 0; CEF_CHROMEELF_VERSION_RELEASE = 3770; - CEF_CHROMEELF_VERSION_BUILD = 80; + CEF_CHROMEELF_VERSION_BUILD = 100; {$IFDEF MSWINDOWS} LIBCEF_DLL = 'libcef.dll'; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 81110e92..ffba5655 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : false, - "InternalVersion" : 12, + "InternalVersion" : 13, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "75.0.8.0" + "Version" : "75.0.11.0" } ], "UpdatePackageData" : {