diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-10-15 23:53:15 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-10-16 00:16:59 +0300 |
commit | 93267ff3e52db97d158016b620b6e5ec64ce1531 (patch) | |
tree | 668031e8cf7d09b9dd9d917b79556cdf4c09f78f | |
parent | a3ff47a4c21518760786a0d15a178ebbe78ac7a7 (diff) |
Adapt to changed <touch/touch.h> API
Change-Id: I9304a0a08c6eed79726700cdc8451dc0fbe613cf
-rw-r--r-- | ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m | 2 | ||||
-rw-r--r-- | ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m index 51492df6094a..ea81427688b3 100644 --- a/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m +++ b/ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m @@ -327,7 +327,7 @@ static const BOOL ENABLE_LO_EVENTS_DURING_PINCH = NO; [self onScroll:state deltaY: limitedDeltaY]; - lo_pan(limitedDeltaX, limitedDeltaY); + touch_lo_pan(limitedDeltaX, limitedDeltaY); return YES; } diff --git a/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m b/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m index 3f9818e8e2cd..9c428b27146c 100644 --- a/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m +++ b/ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m @@ -317,8 +317,10 @@ typedef enum {X,Y,Z} MLOGestureDirection; // dispatch_async() consistently. -void touch_ui_damaged(CGRect rect) +void touch_ui_damaged(int minX, int minY, int width, int height) { + CGRect rect = CGRectMake(minX, minY, width, height); + dispatch_async(dispatch_get_main_queue(), ^{ [[MLORenderManager getInstance] renderWithRect:rect]; |