Fix for iOS scroll by pixels, and pinch to zoom

Minor further changes by tml to match the coding style of surrounding
code mainly.

Change-Id: Ied6087a264f1c6b00763ea36fba9808329afede4
Reviewed-on: https://gerrit.libreoffice.org/5742
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>

1 files changed, 14 insertions, 3 deletions

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index dd92c6e5af2c..e7cec9f9d046 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -426,17 +426,28 @@ void lo_tap(int x, int y)
 }
 
 extern "C"
-void lo_pan(int x, int y)
+void lo_pan(int deltaX, int deltaY)
 {
     SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame();
     if (pFocus) {
-        SAL_INFO( "vcl.ios", "scroll: " << "(" << x << "," << y << ")" );
-        ScrollEvent aEvent( x, y );
+        SAL_INFO( "vcl.ios", "pan delta: " << "(" << deltaX << "," << deltaY << ") ");
+        ScrollEvent aEvent( deltaX, deltaY );
         Application::PostScrollEvent(VCLEVENT_WINDOW_SCROLL, pFocus->GetWindow(), &aEvent);
     }
 }
 
 extern "C"
+void lo_zoom(int x, int y, float scale)
+{
+    SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame();
+    if (pFocus) {
+        SAL_INFO( "vcl.ios", "pinch: " << "(" << scale  << ") ");
+        ZoomEvent aEvent( Point(x,y), scale);
+        Application::PostZoomEvent(VCLEVENT_WINDOW_ZOOM, pFocus->GetWindow(), &aEvent);
+    }
+}
+
+extern "C"
 void lo_keyboard_input(int c)
 {
     SalFrame *pFocus = IosSalInstance::getInstance()->getFocusFrame();