pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-08-14 21:42:50 +02:00
Code Issues Actions 1 Releases Activity

Fixed issue #428 in FMXTabbedBrowser

Browse Source
This commit is contained in:
salvadordf
2022-07-02 20:13:39 +02:00
parent df02ea3bcf
commit 7230669a4b
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
demos/Delphi_FMX_Windows/FMXTabbedBrowser/FMXTabbedBrowser.dproj
View File

@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{7AA2E07C-ACFB-4174-A9F1-083E9BB483BC}</ProjectGuid> <ProjectGuid>{7AA2E07C-ACFB-4174-A9F1-083E9BB483BC}</ProjectGuid>
<ProjectVersion>19.3</ProjectVersion> <ProjectVersion>19.4</ProjectVersion>
<FrameworkType>FMX</FrameworkType> <FrameworkType>FMX</FrameworkType>
<MainSource>FMXTabbedBrowser.dpr</MainSource> <MainSource>FMXTabbedBrowser.dpr</MainSource>
<Base>True</Base> <Base>True</Base>
@@ -280,9 +280,8 @@
</Excluded_Packages> </Excluded_Packages>
</Delphi.Personality> </Delphi.Personality>
<Deployment Version="3"> <Deployment Version="3">
<DeployFile LocalName="Win32\Debug\FMXTabbedBrowser.exe" Configuration="Debug" Class="ProjectOutput"> <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
<Platform Name="Win32"> <Platform Name="iOSSimulator">
<RemoteName>FMXTabbedBrowser.exe</RemoteName>
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
@@ -296,8 +295,9 @@
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule"> <DeployFile LocalName="Win32\Debug\FMXTabbedBrowser.exe" Configuration="Debug" Class="ProjectOutput">
<Platform Name="iOSSimulator"> <Platform Name="Win32">
<RemoteName>FMXTabbedBrowser.exe</RemoteName>
<Overwrite>true</Overwrite> <Overwrite>true</Overwrite>
</Platform> </Platform>
</DeployFile> </DeployFile>
@@ -1382,17 +1382,17 @@
<Operation>1</Operation> <Operation>1</Operation>
</Platform> </Platform>
</DeployClass> </DeployClass>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/> <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/> <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
</Deployment> </Deployment>
<Platforms> <Platforms>
<Platform value="Android">False</Platform> <Platform value="Android">False</Platform>

17
demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas
View File

@@ -93,7 +93,7 @@ type
function GetParentForm : TCustomForm; function GetParentForm : TCustomForm;
function GetParentTab : TTabItem; function GetParentTab : TTabItem;
function GetFMXWindowParentRect : System.Types.TRect; function GetFMXWindowParentRect : TRectF;
procedure CreateFMXWindowParent; procedure CreateFMXWindowParent;
public public
@@ -140,17 +140,18 @@ begin
FMXWindowParent := nil; FMXWindowParent := nil;
end; end;
function TBrowserFrame.GetFMXWindowParentRect : System.Types.TRect; function TBrowserFrame.GetFMXWindowParentRect : TRectF;
var var
TempRect : TRectF; TempRect : TRectF;
TempPoint : TPointF;
TempScale : single; TempScale : single;
begin begin
TempScale := FMXChromium1.ScreenScale; TempScale := FMXChromium1.ScreenScale;
TempRect := WindowParentLay.AbsoluteRect; TempPoint := LocalToAbsolute(WindowParentLay.Position.Point);
Result.Left := round(TempRect.Left * TempScale); Result.Left := TempPoint.x;
Result.Top := round(TempRect.Top * TempScale); Result.Top := TempPoint.y;
Result.Right := round(TempRect.Right * TempScale) - 1; Result.Right := TempPoint.x + (WindowParentLay.Width * TempScale);
Result.Bottom := round(TempREct.Bottom * TempScale) - 1; Result.Bottom := TempPoint.y + (WindowParentLay.Height * TempScale);
end; end;
procedure TBrowserFrame.ReloadBtnClick(Sender: TObject); procedure TBrowserFrame.ReloadBtnClick(Sender: TObject);
@@ -161,7 +162,7 @@ end;
procedure TBrowserFrame.ResizeBrowser; procedure TBrowserFrame.ResizeBrowser;
begin begin
if (FMXWindowParent <> nil) then if (FMXWindowParent <> nil) then
FMXWindowParent.SetBounds(GetFMXWindowParentRect); FMXWindowParent.SetBoundsF(GetFMXWindowParentRect);
end; end;
procedure TBrowserFrame.ShowBrowser; procedure TBrowserFrame.ShowBrowser;

2
update_CEF4Delphi.json
View File

@@ -2,7 +2,7 @@
"UpdateLazPackages" : [ "UpdateLazPackages" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 409, "InternalVersion" : 410,
"Name" : "cef4delphi_lazarus.lpk", "Name" : "cef4delphi_lazarus.lpk",
"Version" : "103.0.8.0" "Version" : "103.0.8.0"
} }