From 7c9000af1e7c98289b6b79d5ef6c4db424edc06a Mon Sep 17 00:00:00 2001 From: chanjh Date: Tue, 5 Dec 2017 21:22:04 +0800 Subject: [PATCH] fix: scrollToIndex withAnimate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为 PageController 设置 scrollToIndex 时，少传了参数导致缺少动画 --- .../UserInterfaceState.xcuserstate | Bin 0 -> 10017 bytes .../xcschemes/xcschememanagement.plist | 14 ++++++++++++++ .../TYPagerController/TYPagerViewLayout.m | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 TYPagerControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/chenjiahao.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 TYPagerControllerDemo.xcodeproj/xcuserdata/chenjiahao.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/TYPagerControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/chenjiahao.xcuserdatad/UserInterfaceState.xcuserstate b/TYPagerControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/chenjiahao.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..f2ab79838f2a4ffe8b9d1ca32646b84a93679b50 GIT binary patch literal 10017 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 KeMdhXm;W!GgHKuj literal 0 HcmV?d00001 diff --git a/TYPagerControllerDemo.xcodeproj/xcuserdata/chenjiahao.xcuserdatad/xcschemes/xcschememanagement.plist b/TYPagerControllerDemo.xcodeproj/xcuserdata/chenjiahao.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..bb7d043 --- /dev/null +++ b/TYPagerControllerDemo.xcodeproj/xcuserdata/chenjiahao.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + TYPagerControllerDemo.xcscheme + + orderHint + 0 + + + + diff --git a/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m b/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m index 7b97f43..e4cca27 100644 --- a/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m +++ b/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m @@ -272,7 +272,7 @@ - (void)scrollToItemAtIndex:(NSInteger)index animate:(BOOL)animate { } [self scrollViewWillScrollToView:_scrollView animate:animate]; - [_scrollView setContentOffset:CGPointMake(index * CGRectGetWidth(_scrollView.frame),0) animated:NO]; + [_scrollView setContentOffset:CGPointMake(index * CGRectGetWidth(_scrollView.frame),0) animated:animate]; [self scrollViewDidScrollToView:_scrollView animate:animate]; }