organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[cleanup] [ios] Fixed traffic button offset.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-11-29 18:24:40 +03:00
parent d17622244e
commit 74978ec869
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
View file

@ -493,7 +493,9 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) {
[parentView addSubview:actionBarView];
[parentView addSubview:contentView];
[self layoutTopViews];
[[MWMMapViewControlsManager manager] searchFrameUpdated:self.searchBarView.frame];
CGRect searchAndStatusBarFrame = self.searchBarView.frame;
searchAndStatusBarFrame.size.height += statusBarHeight();
[[MWMMapViewControlsManager manager] searchFrameUpdated:searchAndStatusBarFrame];
}
[UIView animateWithDuration:kDefaultAnimationDuration
animations:^{

5
iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
View file

@ -14,7 +14,8 @@ typedef NS_ENUM(NSUInteger, MWMTrafficButtonState) {
namespace
{
CGFloat const kTopOffset = 16;
CGFloat const kTopOffset = 26;
CGFloat const kTopShiftedOffset = 6;
} // namespace
@interface MWMMapViewControlsManager ()
@ -118,7 +119,7 @@ CGFloat const kTopOffset = 16;
- (void)refreshLayout
{
runAsyncOnMainQueue(^{
CGFloat const topOffset = self.topBound + kTopOffset;
CGFloat const topOffset = self.topBound > 0 ? self.topBound + kTopShiftedOffset : kTopOffset;
CGFloat const leftOffset =
self.hidden ? -self.view.width : self.leftBound + kViewControlsOffsetToBounds;
UIView * ov = self.view.superview;