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

Merge pull request #4264 from igrechuhin/MAPSME-2320

Browse source 
[ios] Fixed side buttons scroll area.
This commit is contained in:
Vladimir Byko-Ianko 2016-09-14 10:31:16 +03:00 • committed by GitHub
commit 860c80b1c7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm
View file

@ -42,6 +42,9 @@ CGFloat constexpr kZoomOutToLayoutPortraitOffset = 52;
self.defaultBounds.size = size;
}
self.bounds = self.defaultBounds;
if (self.zoomHidden)
self.height = self.location.height;
self.location.maxY = self.height;
self.bottomBound = self.superview.height;
[self layoutXPosition:self.hidden];
@ -116,6 +119,7 @@ CGFloat constexpr kZoomOutToLayoutPortraitOffset = 52;
CGFloat const minX = zoomHidden ? self.width + kViewControlsOffsetToBounds : 0.0;
self.zoomIn.minX = minX;
self.zoomOut.minX = minX;
[self setNeedsLayout];
}
- (void)setHidden:(BOOL)hidden animated:(BOOL)animated
@ -126,7 +130,6 @@ CGFloat constexpr kZoomOutToLayoutPortraitOffset = 52;
return;
if (!hidden)
self.hidden = NO;
[self layoutXPosition:!hidden];
[UIView animateWithDuration:framesDuration(kMenuViewHideFramesCount)
animations:^{
[self layoutXPosition:hidden];
@ -167,7 +170,7 @@ CGFloat constexpr kZoomOutToLayoutPortraitOffset = 52;
{
if (!self.superview)
return _bottomBound;
CGFloat const bottomBoundLimit = (self.superview.height - self.location.maxY) / 2;
CGFloat const bottomBoundLimit = (self.superview.height - self.defaultBounds.size.height) / 2;
return MIN(self.superview.height - bottomBoundLimit, _bottomBound);
}