diff --git a/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx b/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx index 2c6a768e..b4b0f76b 100644 --- a/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx +++ b/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx @@ -2,7 +2,7 @@ object FMXExternalPumpBrowserFrm: TFMXExternalPumpBrowserFrm Left = 0 Top = 0 Caption = 'Initializing browser. Please wait...' - ClientHeight = 534 + ClientHeight = 633 ClientWidth = 800 Position = ScreenCenter FormFactor.Width = 320 @@ -90,7 +90,7 @@ object FMXExternalPumpBrowserFrm: TFMXExternalPumpBrowserFrm Color = claTomato CanFocus = True Size.Width = 800.000000000000000000 - Size.Height = 501.000000000000000000 + Size.Height = 600.000000000000000000 Size.PlatformDefault = False OnEnter = Panel1Enter OnExit = Panel1Exit diff --git a/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas b/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas index c5078c45..56b7ca60 100644 --- a/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas +++ b/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas @@ -1051,8 +1051,9 @@ begin TempTouchEvent.type_ := CEF_TET_CANCELLED; TempPoint := Panel1.ScreenToClient(TempPenInfo.pointerInfo.ptPixelLocation); - TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); - TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); + // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent. + TempTouchEvent.x := TempPoint.x; + TempTouchEvent.y := TempPoint.y; chrmosr.SendTouchEvent(@TempTouchEvent); {$ENDIF} @@ -1101,8 +1102,9 @@ begin TempTouchEvent.type_ := CEF_TET_CANCELLED; TempPoint := Panel1.ScreenToClient(TempTouchInfo.pointerInfo.ptPixelLocation); - TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); - TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); + // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent. + TempTouchEvent.x := TempPoint.x; + TempTouchEvent.y := TempPoint.y; chrmosr.SendTouchEvent(@TempTouchEvent); {$ENDIF} diff --git a/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas b/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas index 410763e9..76b5841d 100644 --- a/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas +++ b/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas @@ -1048,8 +1048,9 @@ begin TempTouchEvent.type_ := CEF_TET_CANCELLED; TempPoint := FMXBufferPanel1.ScreenToClient(TempPenInfo.pointerInfo.ptPixelLocation); - TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); - TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); + // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent. + TempTouchEvent.x := TempPoint.x; + TempTouchEvent.y := TempPoint.y; FMXChromium1.SendTouchEvent(@TempTouchEvent); end; @@ -1095,8 +1096,9 @@ begin TempTouchEvent.type_ := CEF_TET_CANCELLED; TempPoint := FMXBufferPanel1.ScreenToClient(TempTouchInfo.pointerInfo.ptPixelLocation); - TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); - TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); + // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent. + TempTouchEvent.x := TempPoint.x; + TempTouchEvent.y := TempPoint.y; FMXChromium1.SendTouchEvent(@TempTouchEvent); end; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 3f7f7d24..011a9ff2 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 102, + "InternalVersion" : 103, "Name" : "cef4delphi_lazarus.lpk", "Version" : "80.0.4.0" }