diff options
| author | Ilya Grechuhin <i.grechuhin@gmail.com> | 2016-12-06 12:05:13 +0300 |
|---|---|---|
| committer | Ilya Grechuhin <i.grechuhin@gmail.com> | 2016-12-06 12:05:13 +0300 |
| commit | b8bf7854654c8d9334688561a822ee2b2fbd6403 (patch) | |
| tree | a505f147dbb1c15276de284b21f1c460a95f835a /iphone/Maps/Classes/CustomViews/MapViewControls | |
| parent | 3b5ba553f57d0777930cbbc8962368783796076e (diff) | |
[shadow] [ios] Fixed shadows.
Diffstat (limited to 'iphone/Maps/Classes/CustomViews/MapViewControls')
| -rw-r--r-- | iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm | 12 | ||||
| -rw-r--r-- | iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm index 271b635111..006ee2ba45 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm @@ -489,9 +489,9 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { { if (searchBarView.superview == parentView) return; - [parentView addSubview:searchBarView]; - [parentView addSubview:actionBarView]; [parentView addSubview:contentView]; + [parentView addSubview:actionBarView]; + [parentView addSubview:searchBarView]; [self layoutTopViews]; CGRect searchAndStatusBarFrame = self.searchBarView.frame; searchAndStatusBarFrame.size.height += statusBarHeight(); @@ -500,16 +500,16 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerActionBarState) { [UIView animateWithDuration:kDefaultAnimationDuration animations:^{ CGFloat const alpha = hidden ? 0 : 1; - searchBarView.alpha = alpha; - actionBarView.alpha = alpha; contentView.alpha = alpha; + actionBarView.alpha = alpha; + searchBarView.alpha = alpha; } completion:^(BOOL finished) { if (!hidden) return; - [searchBarView removeFromSuperview]; - [actionBarView removeFromSuperview]; [contentView removeFromSuperview]; + [actionBarView removeFromSuperview]; + [searchBarView removeFromSuperview]; }]; } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib index 38d8522e5c..7fd109fab1 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchView.xib @@ -277,6 +277,18 @@ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/> + <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowRadius"> + <integer key="value" value="2"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor"> + <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity"> + <integer key="value" value="1"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="size" keyPath="layer.shadowOffset"> + <size key="value" width="0.0" height="0.0"/> + </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <point key="canvasLocation" x="236" y="-58"/> </view> |