Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/windows/CEF_VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
89.0.18
146.0.7680.179
6 changes: 6 additions & 0 deletions common/windows/cef-checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ set -e
# Terminate script if an unset variable is used
set -u

### REMOVE THIS LINE IT IS JUST FOR TESTING updating the CEF version we don't want to
### wipe out the CEF binaries.

exit 0


## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
Expand Down
3 changes: 2 additions & 1 deletion common/windows/delphi/chromium/Keyman.System.CEFManager.pas
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ constructor TCEFManager.Create(IsDeveloper: Boolean);
GlobalCEFApp.ResourcesDirPath := GlobalCEFApp.FrameworkDirPath;
GlobalCEFApp.LocalesDirPath := GlobalCEFApp.FrameworkDirPath + '\locales';
GlobalCEFApp.EnableGPU := True; // Enable hardware acceleration
GlobalCEFApp.DoNotDeElevate := True;
GlobalCEFApp.cache := TKeymanPaths.CEFDataPath('cache');
GlobalCEFApp.UserDataPath := TKeymanPaths.CEFDataPath('userdata');
GlobalCEFApp.RootCache := TKeymanPaths.CEFDataPath('userdata');
GlobalCEFApp.UserAgent := 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36 (Keyman/'+SKeymanVersion+')';

// We no longer attempt to cleanup before shutdown, and rely on the child cef
Expand Down
2 changes: 1 addition & 1 deletion common/windows/delphi/chromium/Keyman.UI.UframeCEFHost.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ object frameCEFHost: TframeCEFHost
Top = 208
end
object cef: TChromium
OnWidgetCompMsg = cefWidgetCompMsg
OnLoadEnd = cefLoadEnd
OnLoadingStateChange = cefLoadingStateChange
OnGotFocus = cefGotFocus
OnSetFocus = cefSetFocus
OnRunContextMenu = cefRunContextMenu
OnPreKeyEvent = cefPreKeyEvent
Expand Down
9 changes: 4 additions & 5 deletions common/windows/delphi/chromium/Keyman.UI.UframeCEFHost.pas
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ TframeCEFHost = class(TForm, IKeymanCEFHost)
source: TCefFocusSource; out Result: Boolean);
procedure cefTitleChange(Sender: TObject; const browser: ICefBrowser;
const title: ustring);
procedure cefWidgetCompMsg(Sender: TObject; var aMessage: TMessage; var aHandled: Boolean);
procedure cefGotFocus(Sender: TObject; const browser: ICefBrowser);
procedure cefLoadingStateChange(Sender: TObject; const browser: ICefBrowser;
isLoading, canGoBack, canGoForward: Boolean);
private
Expand Down Expand Up @@ -325,12 +325,11 @@ procedure TframeCEFHost.Handle_CEF_TITLECHANGE(var message: TMessage);
FreeMem(p);
end;

procedure TframeCEFHost.cefWidgetCompMsg(Sender: TObject; var aMessage: TMessage;
var aHandled: Boolean);
procedure TframeCEFHost.cefGotFocus(Sender: TObject;
const browser: ICefBrowser);
begin
AssertCefThread;
if aMessage.Msg = WM_SETFOCUS then
PostMessage(FCallbackWnd, CEF_SETFOCUS, 0, 0);
PostMessage(FCallbackWnd, CEF_SETFOCUS, 0, 0);
end;

procedure TframeCEFHost.CreateBrowser;
Expand Down
2 changes: 1 addition & 1 deletion common/windows/delphi/ext/cef4delphi.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Installation notes
------------------

Copy the source/ and packages/ folders from the CEF4Delphi repository
into the windows/src/ext/cef4delphi folder. Ensure that the
into the common/windows/delphi/ext/cef4delphi folder. Ensure that the
CEF4Delphi_binary repository is kept in sync with the cef4delphi source
version.

Expand Down
Loading