1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-11-23 21:34:53 +02:00

Update to CEF 88.2.7

This commit is contained in:
Salvador Diaz Fau
2021-02-13 14:39:56 +01:00
parent 086042c0d9
commit 7de0ea6a81
17 changed files with 554 additions and 236 deletions

View File

@@ -51,8 +51,6 @@ uses
uMainForm in 'uMainForm.pas' {MainForm},
uChildForm in 'uChildForm.pas' {ChildForm};
//{$R *.res}
begin
CreateGlobalCEFApp;

View File

@@ -8,9 +8,8 @@
<Unit0>
<Filename Value="PopupBrowser2.lpr"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<TopLine Value="28"/>
<CursorPos X="64" Y="53"/>
<TopLine Value="25"/>
<CursorPos Y="54"/>
<UsageCount Value="35"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@@ -22,11 +21,11 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<EditorIndex Value="1"/>
<TopLine Value="398"/>
<CursorPos X="71" Y="417"/>
<TopLine Value="19"/>
<CursorPos X="31" Y="58"/>
<UsageCount Value="35"/>
<Bookmarks Count="1">
<Item0 X="50" Y="148" ID="1"/>
<Item0 Y="336" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@@ -38,11 +37,13 @@
<ComponentName Value="ChildForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<TopLine Value="105"/>
<CursorPos X="34" Y="159"/>
<TopLine Value="44"/>
<CursorPos X="34" Y="78"/>
<UsageCount Value="35"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
</Unit2>
<Unit3>
@@ -266,7 +267,7 @@
<OtherDefines Count="1">
<Define0 Value="UseCThreads"/>
</OtherDefines>
<JumpHistory Count="6" HistoryIndex="5">
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="uMainForm.pas"/>
<Caret Line="123" Column="20" TopLine="101"/>
@@ -291,6 +292,102 @@
<Filename Value="uMainForm.pas"/>
<Caret Line="209" Column="80" TopLine="179"/>
</Position6>
<Position7>
<Filename Value="uMainForm.pas"/>
<Caret Line="434" Column="80" TopLine="396"/>
</Position7>
<Position8>
<Filename Value="uMainForm.pas"/>
<Caret Line="215" Column="3" TopLine="213"/>
</Position8>
<Position9>
<Filename Value="uMainForm.pas"/>
<Caret Line="344" Column="3" TopLine="342"/>
</Position9>
<Position10>
<Filename Value="uMainForm.pas"/>
<Caret Line="230" Column="3" TopLine="220"/>
</Position10>
<Position11>
<Filename Value="uMainForm.pas"/>
<Caret Line="353" Column="3" TopLine="350"/>
</Position11>
<Position12>
<Filename Value="uMainForm.pas"/>
<Caret Line="332" Column="5" TopLine="329"/>
</Position12>
<Position13>
<Filename Value="uMainForm.pas"/>
<Caret Line="111" Column="20" TopLine="72"/>
</Position13>
<Position14>
<Filename Value="uMainForm.pas"/>
<Caret Line="431" Column="23" TopLine="399"/>
</Position14>
<Position15>
<Filename Value="uMainForm.pas"/>
<Caret Line="106" Column="15" TopLine="83"/>
</Position15>
<Position16>
<Filename Value="uChildForm.pas"/>
<Caret Line="159" Column="34" TopLine="113"/>
</Position16>
<Position17>
<Filename Value="uChildForm.pas"/>
<Caret Line="156" Column="3" TopLine="113"/>
</Position17>
<Position18>
<Filename Value="uChildForm.pas"/>
<Caret Line="216" Column="3" TopLine="208"/>
</Position18>
<Position19>
<Filename Value="uChildForm.pas"/>
<Caret Line="164" Column="3" TopLine="162"/>
</Position19>
<Position20>
<Filename Value="uMainForm.pas"/>
<Caret Line="447" Column="11" TopLine="405"/>
</Position20>
<Position21>
<Filename Value="uMainForm.pas"/>
<Caret Line="56" Column="15" TopLine="33"/>
</Position21>
<Position22>
<Filename Value="uMainForm.pas"/>
<Caret Line="334" Column="45" TopLine="295"/>
</Position22>
<Position23>
<Filename Value="uChildForm.pas"/>
<Caret Line="272" Column="13" TopLine="241"/>
</Position23>
<Position24>
<Filename Value="uChildForm.pas"/>
<Caret Line="89" Column="15" TopLine="66"/>
</Position24>
<Position25>
<Filename Value="uChildForm.pas"/>
<Caret Line="277" Column="58" TopLine="240"/>
</Position25>
<Position26>
<Filename Value="uChildForm.pas"/>
<Caret Line="278" Column="40" TopLine="244"/>
</Position26>
<Position27>
<Filename Value="uChildForm.pas"/>
<Caret Line="90" Column="15" TopLine="67"/>
</Position27>
<Position28>
<Filename Value="uChildForm.pas"/>
<Caret Line="293" Column="20" TopLine="251"/>
</Position28>
<Position29>
<Filename Value="uChildForm.pas"/>
<Caret Line="172" Column="38" TopLine="158"/>
</Position29>
<Position30>
<Filename Value="uMainForm.pas"/>
<Caret Line="58" Column="31" TopLine="19"/>
</Position30>
</JumpHistory>
<RunParams>
<FormatVersion Value="2"/>

View File

@@ -49,13 +49,8 @@ uses
uCEFChromium, uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFWindowParent,
uCEFWinControl, uCEFLinkedWindowParent, uCEFChromiumEvents;
const
CEF_CLOSECHILD = $A52;
type
{ TChildForm }
TChildForm = class(TForm)
CEFLinkedWindowParent1: TCEFLinkedWindowParent;
Chromium1: TChromium;
@@ -80,12 +75,15 @@ type
FClosing : boolean;
FClientInitialized : boolean;
FPopupFeatures : TCefPopupFeatures;
FCaption : ustring;
procedure WMMove(var aMessage: TLMMove); message LM_MOVE;
procedure WMSize(var aMessage: TLMSize); message LM_SIZE;
procedure WMWindowPosChanged(var aMessage: TLMWindowPosChanged); message LM_WINDOWPOSCHANGED;
procedure BrowserCloseFormMsg(Data: PtrInt);
procedure BrowserSetFocusMsg(Data: PtrInt);
procedure BrowserTitleChangeMsg(Data: PtrInt);
public
procedure AfterConstruction; override;
@@ -167,7 +165,8 @@ end;
procedure TChildForm.Chromium1TitleChange(Sender: TObject; const browser: ICefBrowser; const title: ustring);
begin
Caption := title;
FCaption := title;
SendCompMessage(CEF_TITLECHANGE);
end;
procedure TChildForm.WMMove(var aMessage : TLMMove);
@@ -253,7 +252,7 @@ end;
procedure TChildForm.Chromium1GotFocus(Sender: TObject;
const browser: ICefBrowser);
begin
CEFLinkedWindowParent1.SetFocus;
SendCompMessage(CEF_SETFOCUS);
end;
procedure TChildForm.FormShow(Sender: TObject);
@@ -270,12 +269,24 @@ end;
procedure TChildForm.BrowserCloseFormMsg(Data: PtrInt);
begin
Close;
end;
procedure TChildForm.BrowserSetFocusMsg(Data: PtrInt);
begin
CEFLinkedWindowParent1.SetFocus;
end;
procedure TChildForm.BrowserTitleChangeMsg(Data: PtrInt);
begin
Caption := FCaption;
end;
procedure TChildForm.SendCompMessage(aMsg : cardinal; aData : PtrInt);
begin
case aMsg of
CEF_BEFORECLOSE : Application.QueueAsyncCall(@BrowserCloseFormMsg, aData);
CEF_BEFORECLOSE : Application.QueueAsyncCall(@BrowserCloseFormMsg, aData);
CEF_SETFOCUS : Application.QueueAsyncCall(@BrowserSetFocusMsg, aData);
CEF_TITLECHANGE : Application.QueueAsyncCall(@BrowserTitleChangeMsg, aData);
end;
end;

View File

@@ -53,6 +53,9 @@ const
CEF_CREATENEXTCHILD = $A50;
CEF_CHILDDESTROYED = $A51;
CEF_INITIALIZED = $A52;
CEF_SETFOCUS = $A53;
CEF_TITLECHANGE = $A54;
CEF_CLOSECHILD = $A55;
type
@@ -102,6 +105,7 @@ type
procedure BrowserCreateNextChildMsg(Data: PtrInt);
procedure BrowserChildDestroyedMsg(Data: PtrInt);
procedure BrowserCloseFormMsg(Data: PtrInt);
procedure BrowserSetFocusMsg(Data: PtrInt);
property PopupChildCount : integer read GetPopupChildCount;
@@ -329,7 +333,7 @@ end;
procedure TMainForm.Chromium1GotFocus(Sender: TObject;
const browser: ICefBrowser);
begin
CEFLinkedWindowParent1.SetFocus;
SendCompMessage(CEF_SETFOCUS);
end;
procedure TMainForm.FormActivate(Sender: TObject);
@@ -429,6 +433,11 @@ begin
Close;
end;
procedure TMainForm.BrowserSetFocusMsg(Data: PtrInt);
begin
CEFLinkedWindowParent1.SetFocus;
end;
procedure TMainForm.SendCompMessage(aMsg : cardinal; aData : PtrInt);
begin
case aMsg of
@@ -437,6 +446,7 @@ begin
CEF_CREATENEXTCHILD : Application.QueueAsyncCall(@BrowserCreateNextChildMsg, aData);
CEF_CHILDDESTROYED : Application.QueueAsyncCall(@BrowserChildDestroyedMsg, aData);
CEF_BEFORECLOSE : Application.QueueAsyncCall(@BrowserCloseFormMsg, aData);
CEF_SETFOCUS : Application.QueueAsyncCall(@BrowserSetFocusMsg, aData);
end;
end;