1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-09-30 21:28:55 +02:00

Update to CEF 139.0.30

TCEFWinControl must inherit from TCustomPanel in GTK3
This commit is contained in:
Salvador Díaz Fau
2025-08-27 15:55:39 +02:00
parent 00fbd4346c
commit 2ed634e298
6 changed files with 35 additions and 16 deletions

View File

@@ -47,6 +47,9 @@ type
{$IFDEF MSWINDOWS}
procedure WndProc(var aMessage: TMessage); override;
{$ENDIF}
{$IFDEF LCLGTK3}
procedure Paint; override;
{$ENDIF}
/// <summary>
/// TChromium instance used by this component.
/// </summary>
@@ -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}

View File

@@ -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;

View File

@@ -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
/// <summary>
/// Custom TWinControl used by CEF browsers.
/// </summary>
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;