You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/02/28 02:30:22 UTC
[42/50] incubator-weex git commit: * [ios] change pulling event
offset to scale value
* [ios] change pulling event offset to scale value
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/22d80390
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/22d80390
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/22d80390
Branch: refs/heads/0.11-dev
Commit: 22d8039016eb7665387158330090e292355cbe33
Parents: 94b0eec
Author: acton393 <zh...@gmail.com>
Authored: Fri Feb 24 18:01:34 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Feb 24 18:01:34 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/22d80390/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index 7723ba5..c4f2999 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -424,11 +424,11 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
} else if(_lastContentOffset.y < scrollView.contentOffset.y) {
_direction = @"up";
}
-
+ CGFloat scaleFactor = self.weexInstance.pixelScaleFactor;
[_refreshComponent pullingdown:@{
- REFRESH_DISTANCE_Y: @(fabs(scrollView.contentOffset.y)),
- REFRESH_MAXHEIGHT: @(_refreshComponent.view.frame.size.height),
- REFRESH_HEADERHEIGHT: @(_refreshComponent.view.frame.size.height),
+ REFRESH_DISTANCE_Y: @(fabs(scrollView.contentOffset.y/scaleFactor)),
+ REFRESH_MAXHEIGHT: @(_refreshComponent.view.frame.size.height/scaleFactor),
+ REFRESH_HEADERHEIGHT: @(_refreshComponent.view.frame.size.height/scaleFactor),
@"type":@"pullingdown"
}];
@@ -443,7 +443,6 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
self.onScroll(scrollView);
}
if (_scrollEvent) {
- CGFloat scaleFactor = self.weexInstance.pixelScaleFactor;
NSDictionary *contentSizeData = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithFloat:scrollView.contentSize.width / scaleFactor],@"width",[NSNumber numberWithFloat:scrollView.contentSize.height / scaleFactor],@"height", nil];
//contentOffset values are replaced by (-contentOffset.x,-contentOffset.y) ,in order to be consistent with Android client.
NSDictionary *contentOffsetData = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithFloat:-scrollView.contentOffset.x / scaleFactor],@"x",[NSNumber numberWithFloat:-scrollView.contentOffset.y / scaleFactor],@"y", nil];