Skip to content

Commit 425706a

Browse files
committed
Merge pull request #116 from JagieChen/master
add support for pagingEnabled
2 parents 6fd7071 + 6286ac1 commit 425706a

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

TPKeyboardAvoiding/UIScrollView+TPKeyboardAvoidingAdditions.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ @interface TPKeyboardAvoidingState : NSObject
2626
@property (nonatomic, assign) BOOL keyboardVisible;
2727
@property (nonatomic, assign) CGRect keyboardRect;
2828
@property (nonatomic, assign) CGSize priorContentSize;
29+
30+
31+
@property (nonatomic) BOOL priorPagingEnabled;
2932
@end
3033

3134
@implementation UIScrollView (TPKeyboardAvoidingAdditions)
@@ -61,6 +64,9 @@ - (void)TPKeyboardAvoiding_keyboardWillShow:(NSNotification*)notification {
6164
state.priorInset = self.contentInset;
6265
state.priorScrollIndicatorInsets = self.scrollIndicatorInsets;
6366

67+
state.priorPagingEnabled = self.pagingEnabled;
68+
self.pagingEnabled = NO;
69+
6470
if ( [self isKindOfClass:[TPKeyboardAvoidingScrollView class]] ) {
6571
state.priorContentSize = self.contentSize;
6672

@@ -117,6 +123,7 @@ - (void)TPKeyboardAvoiding_keyboardWillHide:(NSNotification*)notification {
117123

118124
self.contentInset = state.priorInset;
119125
self.scrollIndicatorInsets = state.priorScrollIndicatorInsets;
126+
self.pagingEnabled = state.priorPagingEnabled;
120127
[UIView commitAnimations];
121128
}
122129

0 commit comments

Comments
 (0)