pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Fixed bug with wrong place page content inset in landscape.

Browse source
This commit is contained in:
v.mikhaylenko 2015-06-24 10:42:31 +03:00 • committed by Alex Zolotarev
parent dbdfc7e770
commit 0cc74c336d
1 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
iphone/Maps/Classes/MWMiPhoneLandscapePlacePage.mm
View file

@ -38,13 +38,9 @@ typedef NS_ENUM(NSUInteger, MWMiPhoneLandscapePlacePageState)
- (void)configure
{
[super configure];
CGSize const size = UIScreen.mainScreen.bounds.size;
CGFloat const height = MIN(size.width, size.height);
self.anchorImageView.backgroundColor = [UIColor whiteColor];
self.anchorImageView.image = nil;
CGFloat const headerViewHeight = self.basePlacePageView.height - self.basePlacePageView.featureTable.height;
CGFloat const tableContentHeight = self.basePlacePageView.featureTable.contentSize.height;
self.basePlacePageView.featureTable.contentInset = UIEdgeInsetsMake(0., 0., self.actionBar.height + (tableContentHeight - height - headerViewHeight + self.anchorImageView.height), 0.);
[self configureContentInset];
[self.extendedPlacePageView addSubview:self.actionBar];
[self.manager addSubviews:@[self.extendedPlacePageView] withNavigationController:nil];
}
@ -54,6 +50,44 @@ typedef NS_ENUM(NSUInteger, MWMiPhoneLandscapePlacePageState)
self.state = MWMiPhoneLandscapePlacePageStateOpen;
}
- (void)dismiss
{
self.state = MWMiPhoneLandscapePlacePageStateClosed;
}
- (void)configureContentInset
{
CGFloat const height = self.extendedPlacePageView.height - self.anchorImageView.height;
CGFloat const actionBarHeight = self.actionBar.height;
UITableView * featureTable = self.basePlacePageView.featureTable;
CGFloat const tableContentHeight = featureTable.contentSize.height;
CGFloat const headerViewHeight = self.basePlacePageView.separatorView.maxY;
CGFloat const availableTableHeight = height - headerViewHeight - actionBarHeight;
CGFloat const externalHeight = tableContentHeight - availableTableHeight;
if (externalHeight > 0)
{
featureTable.contentInset = UIEdgeInsetsMake(0., 0., externalHeight, 0.);
featureTable.scrollEnabled = YES;
}
else
{
[featureTable setContentOffset:CGPointZero animated:YES];
featureTable.scrollEnabled = NO;
}
}
- (void)addBookmark
{
[super addBookmark];
[self configureContentInset];
}
- (void)removeBookmark
{
[super removeBookmark];
[self configureContentInset];
}
- (void)updateTargetPoint
{
CGSize const size = UIScreen.mainScreen.bounds.size;
@ -136,6 +170,7 @@ typedef NS_ENUM(NSUInteger, MWMiPhoneLandscapePlacePageState)
self.actionBar.minX = 0.0;
self.actionBar.maxY = height - topBound;
[self updateTargetPoint];
[self configureContentInset];
}
- (void)setTargetPoint:(CGPoint)targetPoint