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

Merge pull request #367 from VladiMihaylenko/vm-master

Browse source 
[ios] Fixed bookmark description editing.
This commit is contained in:
Илья Гречухин 2015-10-23 14:29:20 +03:00
commit 6635d42c18
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm
View file

@ -45,12 +45,13 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
[super viewDidLoad];
self.navigationItem.title = L(@"description");
MWMPlacePageEntity const * entity = self.manager.entity;
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(keyboardWillChangeFrame:)
name:UIKeyboardWillChangeFrameNotification
object:nil];
if (!IPAD)
{
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(keyboardWillChangeFrame:)
name:UIKeyboardWillChangeFrameNotification
object:nil];
}
if (entity.isHTMLDescription)
self.state = BookmarkDescriptionStateViewHTML;
else
@ -60,7 +61,6 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
{
UIBarButtonItem * leftButton = [[UIBarButtonItem alloc] initWithCustomView:self.backButton];
[self.navigationItem setLeftBarButtonItem:leftButton];
return;
}
}
@ -76,6 +76,14 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState)
[self.manager reloadBookmark];
}
- (void)viewDidLayoutSubviews
{
[super viewDidLayoutSubviews];
if (!IPAD)
return;
self.view.height = self.iPadOwnerNavigationController.view.height - self.iPadOwnerNavigationController.navigationBar.height;
}
- (void)setState:(BookmarkDescriptionState)state
{
MWMPlacePageEntity * entity = self.manager.entity;