diff --git a/demos/Delphi_FMX_Windows/FMXTabbedBrowser/FMXTabbedBrowser.dproj b/demos/Delphi_FMX_Windows/FMXTabbedBrowser/FMXTabbedBrowser.dproj index 3cfe3a6f..0bd8a9bd 100644 --- a/demos/Delphi_FMX_Windows/FMXTabbedBrowser/FMXTabbedBrowser.dproj +++ b/demos/Delphi_FMX_Windows/FMXTabbedBrowser/FMXTabbedBrowser.dproj @@ -1,7 +1,7 @@  {7AA2E07C-ACFB-4174-A9F1-083E9BB483BC} - 19.3 + 19.4 FMX FMXTabbedBrowser.dpr True @@ -280,9 +280,8 @@ - - - FMXTabbedBrowser.exe + + true @@ -296,8 +295,9 @@ true - - + + + FMXTabbedBrowser.exe true @@ -1382,17 +1382,17 @@ 1 - - - - - - + - + + + + + + False diff --git a/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas b/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas index 34641566..8f554363 100644 --- a/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas +++ b/demos/Delphi_FMX_Windows/FMXTabbedBrowser/uBrowserFrame.pas @@ -93,7 +93,7 @@ type function GetParentForm : TCustomForm; function GetParentTab : TTabItem; - function GetFMXWindowParentRect : System.Types.TRect; + function GetFMXWindowParentRect : TRectF; procedure CreateFMXWindowParent; public @@ -140,17 +140,18 @@ begin FMXWindowParent := nil; end; -function TBrowserFrame.GetFMXWindowParentRect : System.Types.TRect; +function TBrowserFrame.GetFMXWindowParentRect : TRectF; var TempRect : TRectF; + TempPoint : TPointF; TempScale : single; begin - TempScale := FMXChromium1.ScreenScale; - TempRect := WindowParentLay.AbsoluteRect; - Result.Left := round(TempRect.Left * TempScale); - Result.Top := round(TempRect.Top * TempScale); - Result.Right := round(TempRect.Right * TempScale) - 1; - Result.Bottom := round(TempREct.Bottom * TempScale) - 1; + TempScale := FMXChromium1.ScreenScale; + TempPoint := LocalToAbsolute(WindowParentLay.Position.Point); + Result.Left := TempPoint.x; + Result.Top := TempPoint.y; + Result.Right := TempPoint.x + (WindowParentLay.Width * TempScale); + Result.Bottom := TempPoint.y + (WindowParentLay.Height * TempScale); end; procedure TBrowserFrame.ReloadBtnClick(Sender: TObject); @@ -161,7 +162,7 @@ end; procedure TBrowserFrame.ResizeBrowser; begin if (FMXWindowParent <> nil) then - FMXWindowParent.SetBounds(GetFMXWindowParentRect); + FMXWindowParent.SetBoundsF(GetFMXWindowParentRect); end; procedure TBrowserFrame.ShowBrowser; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 9afcbd84..7e85bafd 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 409, + "InternalVersion" : 410, "Name" : "cef4delphi_lazarus.lpk", "Version" : "103.0.8.0" }