pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-01-03 10:15:38 +02:00
Code Issues Actions Releases Activity

Fixed touch events in FMX demos with high DPI screens

Browse Source
This commit is contained in:
Salvador Díaz Fau 2020-02-27 12:18:43 +01:00
parent feaeb772cb
commit 78adeecde2
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.fmx
View File

@ -2,7 +2,7 @@ object FMXExternalPumpBrowserFrm: TFMXExternalPumpBrowserFrm
Left = 0 Left = 0
Top = 0 Top = 0
Caption = 'Initializing browser. Please wait...' Caption = 'Initializing browser. Please wait...'
ClientHeight = 534 ClientHeight = 633
ClientWidth = 800 ClientWidth = 800
Position = ScreenCenter Position = ScreenCenter
FormFactor.Width = 320 FormFactor.Width = 320
@ -90,7 +90,7 @@ object FMXExternalPumpBrowserFrm: TFMXExternalPumpBrowserFrm
Color = claTomato Color = claTomato
CanFocus = True CanFocus = True
Size.Width = 800.000000000000000000 Size.Width = 800.000000000000000000
Size.Height = 501.000000000000000000 Size.Height = 600.000000000000000000
Size.PlatformDefault = False Size.PlatformDefault = False
OnEnter = Panel1Enter OnEnter = Panel1Enter
OnExit = Panel1Exit OnExit = Panel1Exit

10
demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas
View File

@ -1051,8 +1051,9 @@ begin
TempTouchEvent.type_ := CEF_TET_CANCELLED; TempTouchEvent.type_ := CEF_TET_CANCELLED;
TempPoint := Panel1.ScreenToClient(TempPenInfo.pointerInfo.ptPixelLocation); TempPoint := Panel1.ScreenToClient(TempPenInfo.pointerInfo.ptPixelLocation);
TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent.
TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); TempTouchEvent.x := TempPoint.x;
TempTouchEvent.y := TempPoint.y;
chrmosr.SendTouchEvent(@TempTouchEvent); chrmosr.SendTouchEvent(@TempTouchEvent);
{$ENDIF} {$ENDIF}
@ -1101,8 +1102,9 @@ begin
TempTouchEvent.type_ := CEF_TET_CANCELLED; TempTouchEvent.type_ := CEF_TET_CANCELLED;
TempPoint := Panel1.ScreenToClient(TempTouchInfo.pointerInfo.ptPixelLocation); TempPoint := Panel1.ScreenToClient(TempTouchInfo.pointerInfo.ptPixelLocation);
TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent.
TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); TempTouchEvent.x := TempPoint.x;
TempTouchEvent.y := TempPoint.y;
chrmosr.SendTouchEvent(@TempTouchEvent); chrmosr.SendTouchEvent(@TempTouchEvent);
{$ENDIF} {$ENDIF}

10
demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas
View File

@ -1048,8 +1048,9 @@ begin
TempTouchEvent.type_ := CEF_TET_CANCELLED; TempTouchEvent.type_ := CEF_TET_CANCELLED;
TempPoint := FMXBufferPanel1.ScreenToClient(TempPenInfo.pointerInfo.ptPixelLocation); TempPoint := FMXBufferPanel1.ScreenToClient(TempPenInfo.pointerInfo.ptPixelLocation);
TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent.
TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); TempTouchEvent.x := TempPoint.x;
TempTouchEvent.y := TempPoint.y;
FMXChromium1.SendTouchEvent(@TempTouchEvent); FMXChromium1.SendTouchEvent(@TempTouchEvent);
end; end;
@ -1095,8 +1096,9 @@ begin
TempTouchEvent.type_ := CEF_TET_CANCELLED; TempTouchEvent.type_ := CEF_TET_CANCELLED;
TempPoint := FMXBufferPanel1.ScreenToClient(TempTouchInfo.pointerInfo.ptPixelLocation); TempPoint := FMXBufferPanel1.ScreenToClient(TempTouchInfo.pointerInfo.ptPixelLocation);
TempTouchEvent.x := DeviceToLogical(TempPoint.x, GlobalCEFApp.DeviceScaleFactor); // TFMXBufferPanel.ScreenToClient applies the scale factor. No need to call DeviceToLogical to set TempTouchEvent.
TempTouchEvent.y := DeviceToLogical(TempPoint.y, GlobalCEFApp.DeviceScaleFactor); TempTouchEvent.x := TempPoint.x;
TempTouchEvent.y := TempPoint.y;
FMXChromium1.SendTouchEvent(@TempTouchEvent); FMXChromium1.SendTouchEvent(@TempTouchEvent);
end; end;

2
update_CEF4Delphi.json
View File

@ -2,7 +2,7 @@
"UpdateLazPackages" : [ "UpdateLazPackages" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 102, "InternalVersion" : 103,
"Name" : "cef4delphi_lazarus.lpk", "Name" : "cef4delphi_lazarus.lpk",
"Version" : "80.0.4.0" "Version" : "80.0.4.0"
} }