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

[ios] Fixed PlacePageInfoCell empty address layout

Browse source
This commit is contained in:
Igor Khmurets 2014-06-17 12:47:17 +03:00 • committed by Alex Zolotarev
parent 037ac82686
commit 8c2c65e921
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
iphone/Maps/Classes/PlacePageInfoCell.mm
View file

@ -89,6 +89,7 @@
}
#define ADDRESS_LEFT_SHIFT 19
#define COORDINATES_RIGHT_SHIFT 48
#define RIGHT_SHIFT 55
#define DISTANCE_LEFT_SHIFT 55
@ -115,7 +116,8 @@
[self.addressLabel sizeToFit];
self.addressLabel.origin = CGPointMake(ADDRESS_LEFT_SHIFT, addressY);
// coordinates label is wider than address label, to fit long DMS coordinates
self.coordinatesLabel.frame = CGRectMake(ADDRESS_LEFT_SHIFT, self.addressLabel.maxY + 10, self.width - ADDRESS_LEFT_SHIFT - ADDRESS_LEFT_SHIFT, 24);
CGFloat coordinatesShift = self.addressLabel.height ? 10 : 0;
self.coordinatesLabel.frame = CGRectMake(ADDRESS_LEFT_SHIFT, self.addressLabel.maxY + coordinatesShift, self.width - ADDRESS_LEFT_SHIFT - COORDINATES_RIGHT_SHIFT, 24);
self.selectedColorView.center = CGPointMake(self.width - 32, 27);
@ -129,8 +131,11 @@
+ (CGFloat)cellHeightWithAddress:(NSString *)address viewWidth:(CGFloat)viewWidth
{
CGFloat addressHeight = [address sizeWithDrawSize:CGSizeMake(viewWidth - ADDRESS_LEFT_SHIFT - RIGHT_SHIFT, 200) font:ADDRESS_FONT].height;
return addressHeight + ([[MapsAppDelegate theApp].m_locationManager enabledOnMap] ? 110 : 66);
NSString * addressCopy = [address copy];
if ([addressCopy isEqualToString:@""])
addressCopy = nil;
CGFloat addressHeight = [addressCopy sizeWithDrawSize:CGSizeMake(viewWidth - ADDRESS_LEFT_SHIFT - RIGHT_SHIFT, 200) font:ADDRESS_FONT].height;
return addressHeight + ([[MapsAppDelegate theApp].m_locationManager enabledOnMap] ? 100 : 56) + (addressHeight ? 10 : 0);
}
- (void)addressPress:(id)sender