From f527566ea83bf705ba0b5c6e79543f81f9ff09b9 Mon Sep 17 00:00:00 2001 From: tmiedema Date: Mon, 2 Oct 2017 12:42:40 +0200 Subject: [PATCH] Passing animate parameter to scrollview when pressing tab --- .../UserInterfaceState.xcuserstate | Bin 0 -> 15145 bytes .../xcschemes/xcschememanagement.plist | 14 ++++++++++++++ .../TYPagerController/TYPagerViewLayout.m | 2 +- .../xcschemes/xcschememanagement.plist | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 TYPagerControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/Tom.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 TYPagerControllerDemo.xcodeproj/xcuserdata/Tom.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 TYPagerControllerDemo_swift.xcodeproj/xcuserdata/Tom.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/TYPagerControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/Tom.xcuserdatad/UserInterfaceState.xcuserstate b/TYPagerControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/Tom.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..262d8136736ec439332fb928d181f67ee32ca954 GIT binary patch literal 15145 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 + + + + SchemeUserState + + TYPagerControllerDemo.xcscheme + + orderHint + 0 + + + + diff --git a/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m b/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m index 1e3ec1e..7a3d6c6 100644 --- a/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m +++ b/TYPagerControllerDemo/TYPagerController/TYPagerViewLayout.m @@ -271,7 +271,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]; } diff --git a/TYPagerControllerDemo_swift.xcodeproj/xcuserdata/Tom.xcuserdatad/xcschemes/xcschememanagement.plist b/TYPagerControllerDemo_swift.xcodeproj/xcuserdata/Tom.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..7653099 --- /dev/null +++ b/TYPagerControllerDemo_swift.xcodeproj/xcuserdata/Tom.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + TYPagerControllerDemo_swift.xcscheme + + orderHint + 0 + + + +