|
|
@@ -51,20 +51,24 @@ static const CGFloat kColumnMargin = 1;
|
|
|
CGFloat height = self.frame.size.height;
|
|
|
CGFloat topheaderHeight = [self topHeaderHeight];
|
|
|
CGFloat leftHeaderWidth = [self leftHeaderWidth];
|
|
|
+ CGFloat topInsets = 0.f;
|
|
|
|
|
|
+ if (@available (iOS 11.0, *)) {
|
|
|
+ topInsets = self.safeAreaInsets.top;
|
|
|
+ }
|
|
|
CGFloat contentWidth = 0.0;
|
|
|
NSInteger rowsCount = [self numberOfColumns];
|
|
|
for (int i = 0; i < rowsCount; i++) {
|
|
|
contentWidth += [self contentWidthForColumn:i];
|
|
|
}
|
|
|
|
|
|
- self.leftTableView.frame = CGRectMake(0, topheaderHeight, leftHeaderWidth, height - topheaderHeight);
|
|
|
- self.headerScrollView.frame = CGRectMake(leftHeaderWidth, 0, width - leftHeaderWidth, topheaderHeight);
|
|
|
+ self.leftTableView.frame = CGRectMake(0, topheaderHeight + topInsets, leftHeaderWidth, height - topheaderHeight - topInsets);
|
|
|
+ self.headerScrollView.frame = CGRectMake(leftHeaderWidth, topInsets, width - leftHeaderWidth, topheaderHeight);
|
|
|
self.headerScrollView.contentSize = CGSizeMake( self.contentTableView.frame.size.width, self.headerScrollView.frame.size.height);
|
|
|
- self.contentTableView.frame = CGRectMake(0, 0, contentWidth + [self numberOfColumns] * [self columnMargin] , height - topheaderHeight);
|
|
|
- self.contentScrollView.frame = CGRectMake(leftHeaderWidth, topheaderHeight, width - leftHeaderWidth, height - topheaderHeight);
|
|
|
+ self.contentTableView.frame = CGRectMake(0, 0, contentWidth + [self numberOfColumns] * [self columnMargin] , height - topheaderHeight - topInsets);
|
|
|
+ self.contentScrollView.frame = CGRectMake(leftHeaderWidth, topheaderHeight + topInsets, width - leftHeaderWidth, height - topheaderHeight - topInsets);
|
|
|
self.contentScrollView.contentSize = self.contentTableView.frame.size;
|
|
|
- self.leftHeader.frame = CGRectMake(0, 0, [self leftHeaderWidth], [self topHeaderHeight]);
|
|
|
+ self.leftHeader.frame = CGRectMake(0, topInsets, [self leftHeaderWidth], [self topHeaderHeight]);
|
|
|
}
|
|
|
|
|
|
|