From a1277c2c8d2e3e1bfc1c7f2a949a5130cf2972ad Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Fri, 29 May 2015 16:07:10 +0300 Subject: [PATCH] [ios] Fix menu appear while on search screen. --- .../CustomViews/MapViewControls/MWMMapViewControlsManager.mm | 3 ++- iphone/Maps/Classes/MapViewController.mm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index a328c92b0e..1eedf85816 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -49,7 +49,8 @@ case MWMMapViewControlsButtonZoom: [self.zoomButtons moveToDefaultPosition:defaultPosition]; break; - default: + case MWMMapViewControlsButtonMenu: + case MWMMapViewControlsButtonLocation: break; } } diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 59e5759e39..d4b357ac1a 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -259,7 +259,7 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick"; Framework & f = GetFramework(); UserMark const * userMark = f.GetUserMark(pxClicked, isLongClick); - if (f.HasActiveUserMark() == false) + if (f.HasActiveUserMark() == false && self.searchView.state == SearchViewStateHidden) { if (userMark == nullptr) self.controlsManager.hidden = !self.controlsManager.hidden;