Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorv.mikhaylenko <v.mikhaylenko@corp.mail.ru>2015-06-30 17:26:54 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:53:22 +0300
commitca20c564649b2bccae255cb3eaf6fa6db8f7719b (patch)
tree6e6a90b56ebaf8d49c93a0c73f46aafb067c0820 /iphone/Maps/Classes/MWMPlacePageActionBar.mm
parentd5548297859c218d2bbbffb510c0a4aa73e0a3bc (diff)
[ios] Fixed buttons layout in my position place page.
Diffstat (limited to 'iphone/Maps/Classes/MWMPlacePageActionBar.mm')
-rw-r--r--iphone/Maps/Classes/MWMPlacePageActionBar.mm9
1 files changed, 5 insertions, 4 deletions
diff --git a/iphone/Maps/Classes/MWMPlacePageActionBar.mm b/iphone/Maps/Classes/MWMPlacePageActionBar.mm
index ee6dfa6d02..61d7b67ce1 100644
--- a/iphone/Maps/Classes/MWMPlacePageActionBar.mm
+++ b/iphone/Maps/Classes/MWMPlacePageActionBar.mm
@@ -74,7 +74,7 @@ static NSString * const kPlacePageActionBarNibName = @"PlacePageActionBar";
- (void)layoutSubviews
{
BOOL const isMyPosition = self.placePage.manager.entity.type == MWMPlacePageEntityTypeMyPosition;
- if (GetFramework().IsRouteBuilding())
+ if (GetFramework().IsRouteBuilding() && !isMyPosition)
[self startActivityIndicator];
CGPoint const center = self.center;
@@ -83,9 +83,10 @@ static NSString * const kPlacePageActionBarNibName = @"PlacePageActionBar";
{
CGSize const size = [[UIScreen mainScreen] bounds].size;
CGFloat const maximumWidth = 360.;
- CGFloat const screenWidth = MIN(size.height, maximumWidth);
- self.bookmarkButton.center = CGPointMake(3. * screenWidth / 4., self.bookmarkButton.center.y);
- self.shareButton.center = CGPointMake(screenWidth / 4., self.bookmarkButton.center.y);
+ CGFloat const actualWidth = MIN(MIN(size.height, size.width), maximumWidth);
+ self.bookmarkButton.center = CGPointMake(3. * actualWidth / 4., self.bookmarkButton.center.y);
+ self.shareButton.center = CGPointMake(actualWidth / 4., self.bookmarkButton.center.y);
+ [self.indicatior removeFromSuperview];
}
else
{