summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorptyl@cloudon.com <ptyl@cloudon.com>2013-09-01 19:22:23 +0300
committerTor Lillqvist <tml@collabora.com>2013-10-09 14:37:46 +0000
commit4e7495ac2cb6b015ad492def45fd24f4ba0f54f8 (patch)
treea23c409bd5bf2f2a54a26a50b4c7e29054af666d /include
parentff3b823ef4b867263711703fab596584314e4f58 (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/osl/detail/ios-bootstrap.h3
-rw-r--r--include/touch/touch.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/include/osl/detail/ios-bootstrap.h b/include/osl/detail/ios-bootstrap.h
index fa3d0c85b460..42c38e493721 100644
--- a/include/osl/detail/ios-bootstrap.h
+++ b/include/osl/detail/ios-bootstrap.h
@@ -49,7 +49,8 @@ void lo_runMain();
void lo_set_view_size(int width, int height);
void lo_render_windows(CGContextRef context, CGRect rect);
void lo_tap(int x, int y);
-void lo_pan(int x, int y);
+void lo_pan(int deltaX, int deltaY);
+void lo_zoom(int x, int y, float scale);
void lo_keyboard_input(int c);
#ifdef __cplusplus
diff --git a/include/touch/touch.h b/include/touch/touch.h
index 8fa2dd16d26c..2fd7a9a9b6eb 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -14,6 +14,10 @@
#if !HAVE_FEATURE_DESKTOP
+#define MOBILE_MAX_ZOOM_IN 600
+#define MOBILE_MAX_ZOOM_OUT 80
+#define MOBILE_ZOOM_SCALE_MULTIPLIER 10000
+
// Functions to be implemented by the app-specifc upper or less
// app-specific but platform-specific medium layer on touch-based
// platforms. The same API is used on each such platform. There are