2
0
Эх сурвалжийг харах

Update property name

Update property name
MJLee 10 жил өмнө
parent
commit
84d57f6733

+ 2 - 2
MJRefresh/Base/MJRefreshBackFooter.m

@@ -65,9 +65,9 @@ - (void)scrollViewContentSizeDidChange:(NSDictionary *)change
     [super scrollViewContentSizeDidChange:change];
     
     // 内容的高度
-    CGFloat contentHeight = self.scrollView.mj_contentH + self.ignoredInsetBottom;
+    CGFloat contentHeight = self.scrollView.mj_contentH + self.ignoredScrollViewContentInsetTop;
     // 表格的高度
-    CGFloat scrollHeight = self.scrollView.mj_h - self.scrollViewOriginalInset.top - self.scrollViewOriginalInset.bottom + self.ignoredInsetBottom;
+    CGFloat scrollHeight = self.scrollView.mj_h - self.scrollViewOriginalInset.top - self.scrollViewOriginalInset.bottom + self.ignoredScrollViewContentInsetTop;
     // 这里一定是用:self.scrollView.mj_insetT 和 self.scrollViewOriginalInset.bottom;
     // 设置位置和尺寸
     self.mj_y = MAX(contentHeight, scrollHeight);

+ 2 - 2
MJRefresh/Base/MJRefreshFooter.h

@@ -20,6 +20,6 @@
 /** 重置没有更多的数据(消除没有更多数据的状态) */
 - (void)resetNoMoreData;
 
-/** 忽略多少ignoredInsetBottom */
-@property (assign, nonatomic) CGFloat ignoredInsetBottom;
+/** 忽略多少scrollView的contentInset的bottom */
+@property (assign, nonatomic) CGFloat ignoredScrollViewContentInsetTop;
 @end

+ 2 - 2
MJRefresh/Base/MJRefreshHeader.h

@@ -20,6 +20,6 @@
 /** 上一次下拉刷新成功的时间 */
 @property (strong, nonatomic, readonly) NSDate *lastUpdatedTime;
 
-/** 忽略多少ignoredInsetTop */
-@property (assign, nonatomic) CGFloat ignoredInsetTop;
+/** 忽略多少scrollView的contentInset的top */
+@property (assign, nonatomic) CGFloat ignoredScrollViewContentInsetTop;
 @end

+ 1 - 1
MJRefresh/Base/MJRefreshHeader.m

@@ -45,7 +45,7 @@ - (void)placeSubviews
     [super placeSubviews];
     
     // 设置y值(当自己的高度发生改变了,肯定要重新调整Y值,所以放到placeSubviews方法中设置y值)
-    self.mj_y = - self.mj_h - self.ignoredInsetTop;
+    self.mj_y = - self.mj_h - self.ignoredScrollViewContentInsetTop;
 }
 
 - (void)scrollViewContentOffsetDidChange:(NSDictionary *)change

BIN
MJRefreshExample/MJRefreshExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
MJRefreshExample/MJRefreshExample/Classes/MJTableViewController.m

@@ -231,7 +231,7 @@ - (void)example18
     // 设置了底部inset
     self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 30, 0);
     // 忽略掉底部inset
-    self.tableView.footer.ignoredInsetBottom = 30;
+    self.tableView.footer.ignoredScrollViewContentInsetTop = 30;
 }
 
 #pragma mark UITableView + 上拉刷新 自动回弹的上拉02