diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index a58cc6cc2c..11d8703052 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -113,7 +113,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page: if (!self.layout) { - self.layout = [[MWMPlacePageLayout alloc] initWithOwnerView:self.ownerViewController.view + self.layout = [[MWMPlacePageLayout alloc] initWithOwnerView:self.ownerViewController.controlsView delegate:self dataSource:self]; } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm index 0216358748..69b4e38995 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMiPhonePlacePageLayoutImpl.mm @@ -143,7 +143,9 @@ typedef NS_ENUM(NSUInteger, MWMScrollDirection) { - (CGFloat)openContentOffset { CGSize size = self.ownerView.size; CGFloat offset = self.isPortrait ? MAX(size.width, size.height) : MIN(size.width, size.height); - return offset * kTopPlacePageStopValue; + CGFloat actionBarHeight = self.actionBar.height; + offset -= actionBarHeight; + return offset * kTopPlacePageStopValue + actionBarHeight; } - (CGFloat)topContentOffset { @@ -155,7 +157,9 @@ typedef NS_ENUM(NSUInteger, MWMScrollDirection) { - (CGFloat)previewPlusContentOffset { CGSize size = self.ownerView.size; CGFloat offset = self.isPortrait ? MAX(size.width, size.height) : MIN(size.width, size.height); - CGFloat previewPlusOffset = offset * kExpandedPlacePageStopValue; + CGFloat actionBarHeight = self.actionBar.height; + offset -= actionBarHeight; + CGFloat previewPlusOffset = offset * kExpandedPlacePageStopValue + actionBarHeight; CGFloat previewOffset = [self previewContentOffset]; if (previewPlusOffset < previewOffset + kLuftDraggingOffset) { return previewOffset + kLuftDraggingOffset; diff --git a/iphone/Maps/UI/Storyboard/Main.storyboard b/iphone/Maps/UI/Storyboard/Main.storyboard index 393b3312b4..13ff0e1abc 100644 --- a/iphone/Maps/UI/Storyboard/Main.storyboard +++ b/iphone/Maps/UI/Storyboard/Main.storyboard @@ -102,7 +102,7 @@ - + @@ -1050,10 +1050,10 @@ - + - + @@ -1061,7 +1061,7 @@