From 91d8f0f1eea6cd322d7906bf0eff1956db179226 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Wed, 24 Jun 2015 18:49:38 +0300 Subject: [PATCH] [ios] Fixed iphone landscape PP & SearchViewStateResults layout --- iphone/Maps/Classes/MapViewController.mm | 19 +++++++++++++++---- iphone/Maps/Classes/SearchView.h | 1 + iphone/Maps/Classes/SearchView.mm | 3 ++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index f4b0f25590..da15764b41 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -930,26 +930,37 @@ typedef NS_OPTIONS(NSUInteger, MapInfoView) case SearchViewStateHidden: self.controlsManager.hidden = NO; [self moveRouteViewAnimatedtoOffset:0.0]; - [self clearMapInfoViewFlag:MapInfoViewSearch]; break; case SearchViewStateResults: self.controlsManager.hidden = NO; [self moveRouteViewAnimatedtoOffset:self.searchView.searchBar.maxY]; - [self setMapInfoViewFlag:MapInfoViewSearch]; break; case SearchViewStateAlpha: self.controlsManager.hidden = NO; - [self clearMapInfoViewFlag:MapInfoViewSearch]; break; case SearchViewStateFullscreen: self.controlsManager.hidden = YES; GetFramework().ActivateUserMark(NULL); - [self clearMapInfoViewFlag:MapInfoViewSearch]; break; } [self updateStatusBarStyle]; } +- (void)searchViewDidEnterState:(SearchViewState)state +{ + switch (state) + { + case SearchViewStateResults: + [self setMapInfoViewFlag:MapInfoViewSearch]; + break; + case SearchViewStateHidden: + case SearchViewStateAlpha: + case SearchViewStateFullscreen: + [self clearMapInfoViewFlag:MapInfoViewSearch]; + break; + } +} + #pragma mark - Layout - (void)moveRouteViewAnimatedtoOffset:(CGFloat)offset diff --git a/iphone/Maps/Classes/SearchView.h b/iphone/Maps/Classes/SearchView.h index 3f192fdae1..7911bd5431 100644 --- a/iphone/Maps/Classes/SearchView.h +++ b/iphone/Maps/Classes/SearchView.h @@ -14,6 +14,7 @@ typedef NS_ENUM(NSUInteger, SearchViewState) { @protocol SearchViewDelegate - (void)searchViewWillEnterState:(SearchViewState)state; +- (void)searchViewDidEnterState:(SearchViewState)state; @end diff --git a/iphone/Maps/Classes/SearchView.mm b/iphone/Maps/Classes/SearchView.mm index 5f3e79c645..c0d9c1b3cc 100644 --- a/iphone/Maps/Classes/SearchView.mm +++ b/iphone/Maps/Classes/SearchView.mm @@ -251,8 +251,9 @@ static BOOL keyboardLoaded = NO; } completion:nil]; [self.searchBar.textField resignFirstResponder]; } - _state = state; GetFramework().Invalidate(); + _state = state; + [self.delegate searchViewDidEnterState:state]; } - (void)onLocationError:(location::TLocationError)errorCode