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

Merge pull request #4039 from igrechuhin/MAPSME-2057

Browse source 
[ios] Fixed status bar height estimation for iOS7.
This commit is contained in:
Vlad Mihaylenko 2016-08-12 12:46:04 +04:00 • committed by GitHub
commit 1aa7ed620e
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Classes/Common.h
View file

@ -87,6 +87,12 @@ static inline BOOL equalScreenDimensions(CGFloat left, CGFloat right)
return fabs(left - right) < 0.5;
}
static inline CGFloat statusBarHeight()
{
CGSize const statusBarSize = [UIApplication sharedApplication].statusBarFrame.size;
return MIN(statusBarSize.height, statusBarSize.width);
}
static inline void runAsyncOnMainQueue(dispatch_block_t block)
{
dispatch_async(dispatch_get_main_queue(), block);

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

@ -83,9 +83,9 @@ CGFloat constexpr kZoomOutToLayoutPortraitOffset = 52;
- (void)animate
{
[self layoutYPosition];
CGFloat const statusBarHeight = [UIApplication sharedApplication].statusBarFrame.size.height;
CGFloat const spaceLeft = self.bottomBound - self.topBound -
(equalScreenDimensions(self.topBound, 0.0) ? statusBarHeight : 0.0);
(equalScreenDimensions(self.topBound, 0.0) ? statusBarHeight() : 0.0);
BOOL const isZoomHidden = self.zoomIn.alpha == 0.0;
BOOL const willZoomHide = (self.defaultBounds.size.height > spaceLeft);
if (willZoomHide)

10
iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationView.mm
View file

@ -1,8 +1,6 @@
#import "Common.h"
#import "MWMNavigationView.h"
static CGFloat const kStatusbarHeight = 20.0;
@interface MWMNavigationView ()
@property (nonatomic) BOOL isVisible;
@ -47,7 +45,8 @@ static CGFloat const kStatusbarHeight = 20.0;
{
if (!CGRectEqualToRect(self.frame, self.defaultFrame))
self.frame = self.defaultFrame;
self.statusbarBackground.frame = CGRectMake(0.0, -kStatusbarHeight, self.width, kStatusbarHeight);
CGFloat const sbHeight = statusBarHeight();
self.statusbarBackground.frame = CGRectMake(0.0, -sbHeight, self.width, sbHeight);
[self.delegate navigationDashBoardDidUpdate];
}
completion:^(BOOL finished)
@ -68,8 +67,9 @@ static CGFloat const kStatusbarHeight = 20.0;
- (void)setTopBound:(CGFloat)topBound
{
_topBound = MAX(topBound, kStatusbarHeight);
if (_topBound <= kStatusbarHeight)
CGFloat const sbHeight = statusBarHeight();
_topBound = MAX(topBound, sbHeight);
if (_topBound <= sbHeight)
{
if (![self.statusbarBackground.superview isEqual:self])
[self addSubview:self.statusbarBackground];