erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-11 18:17:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(windows): chromium focus

Browse source 
Focus was over-eager -- couldn't lose focus.
Also makes cef functions virtual to allow for
override.
This commit is contained in:
Marc Durdin 2020-02-22 13:41:34 +08:00
parent 50559d32a5
commit ddcdf486ce
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
windows/src/global/delphi/ui/UfrmWebContainer.pas
View file

@ -64,19 +64,20 @@ type
procedure WMUser_ContentRender(var Message: TMessage); message WM_USER_ContentRender;
procedure DownloadUILanguages;
procedure ContributeUILanguages;
procedure cefLoadEnd(Sender: TObject);
procedure cefBeforeBrowse(Sender: TObject; const Url: string; wasHandled: Boolean);
procedure cefBeforeBrowseSync(Sender: TObject; const Url: string;
out Handled: Boolean); // I4989
procedure cefPreKeySyncEvent(Sender: TObject; e: TCEFHostKeyEventData; out isShortcut, Handled: Boolean);
procedure cefKeyEvent(Sender: TObject; e: TCEFHostKeyEventData; wasShortcut, wasHandled: Boolean);
procedure cefCommand(Sender: TObject; const command: string;
params: TStringList);
procedure cefResizeFromDocument(Sender: TObject; awidth, aheight: Integer);
procedure cefHelpTopic(Sender: TObject);
protected
cef: TframeCEFHost;
procedure cefLoadEnd(Sender: TObject); virtual;
procedure cefBeforeBrowse(Sender: TObject; const Url: string; wasHandled: Boolean); virtual;
procedure cefBeforeBrowseSync(Sender: TObject; const Url: string;
out Handled: Boolean); virtual; // I4989
procedure cefPreKeySyncEvent(Sender: TObject; e: TCEFHostKeyEventData; out isShortcut, Handled: Boolean); virtual;
procedure cefKeyEvent(Sender: TObject; e: TCEFHostKeyEventData; wasShortcut, wasHandled: Boolean); virtual;
procedure cefCommand(Sender: TObject; const command: string;
params: TStringList); virtual;
procedure cefResizeFromDocument(Sender: TObject; awidth, aheight: Integer); virtual;
procedure cefHelpTopic(Sender: TObject); virtual;
procedure FireCommand(const command: WideString; params: TStringList); virtual;
function ShouldProcessAllCommands: Boolean; virtual;
function ShouldSetAppTitle: Boolean; virtual; // I2786
@ -195,8 +196,8 @@ end;
procedure TfrmWebContainer.SetFocus; // I2720
begin
// if Assigned(cef) then
// cef.SetFocus;
if Assigned(cef) then
cef.SetFocus;
end;
function TfrmWebContainer.ShouldProcessAllCommands: Boolean;
@ -363,9 +364,12 @@ begin
with Message do
case Msg of
WM_ACTIVATE, WM_SETFOCUS, WM_KILLFOCUS:
WM_SETFOCUS:
if Assigned(cef) then
cef.SetFocus;
WM_ACTIVATE:
begin
if Assigned(cef) then
if (Message.WParam <> 0) and Assigned(cef) then
cef.SetFocus;
end;
end;