Skip to content

Commit 3549c68

Browse files
author
Sergey D
authored
Merge pull request #43 from Yalantis/bugfix/issue-41
Bugfix/issue 41
2 parents ca98481 + 0ddf31d commit 3549c68

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

‎Example/ContextMenu/Base.lproj/Main.storyboard‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="buo-es-Y5h">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="buo-es-Y5h">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
47
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<scenes>
812
<!--Samantha-->
@@ -14,17 +18,17 @@
1418
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
1519
</layoutGuides>
1620
<view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1822
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
1923
<subviews>
20-
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Photo" translatesAutoresizingMaskIntoConstraints="NO" id="ONV-Ho-D5n">
24+
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Photo" translatesAutoresizingMaskIntoConstraints="NO" id="ONV-Ho-D5n">
2125
<rect key="frame" x="0.0" y="44" width="600" height="200"/>
22-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
26+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
2327
<constraints>
2428
<constraint firstAttribute="height" constant="200" id="t6Z-2S-j8x"/>
2529
</constraints>
2630
</imageView>
27-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="My Description" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3gN-r7-AnJ">
31+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="My Description" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3gN-r7-AnJ">
2832
<rect key="frame" x="10" y="269" width="600" height="31.5"/>
2933
<constraints>
3034
<constraint firstAttribute="height" constant="32" id="Q7w-eh-tzF"/>
@@ -33,16 +37,16 @@
3337
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
3438
<nil key="highlightedColor"/>
3539
</label>
36-
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nZH-yZ-0mA">
40+
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nZH-yZ-0mA">
3741
<rect key="frame" x="10" y="312.5" width="580" height="277.5"/>
38-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
42+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
3943
<string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
40-
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
44+
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4145
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
4246
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
4347
</textView>
4448
</subviews>
45-
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
49+
<color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4650
<constraints>
4751
<constraint firstItem="3gN-r7-AnJ" firstAttribute="top" secondItem="ONV-Ho-D5n" secondAttribute="bottom" constant="25" id="3sH-36-aHQ"/>
4852
<constraint firstItem="ONV-Ho-D5n" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="727-Pi-1p1"/>
@@ -75,8 +79,8 @@
7579
<navigationController automaticallyAdjustsScrollViewInsets="NO" id="buo-es-Y5h" sceneMemberID="viewController">
7680
<toolbarItems/>
7781
<nil key="simulatedStatusBarMetrics"/>
78-
<navigationBar key="navigationBar" contentMode="scaleToFill" id="lrR-Le-siU">
79-
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
82+
<navigationBar key="navigationBar" contentMode="scaleToFill" id="lrR-Le-siU" customClass="YALNavigationBar">
83+
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
8084
<autoresizingMask key="autoresizingMask"/>
8185
</navigationBar>
8286
<nil name="viewControllers"/>

‎Example/ContextMenu/ViewController.m‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,11 @@ @implementation ViewController
3333

3434
- (void)viewDidLoad {
3535
[super viewDidLoad];
36-
[self initiateMenuOptions];
3736

38-
// set custom navigationBar with a bigger height
39-
[self.navigationController setValue:[[YALNavigationBar alloc]init] forKeyPath:@"navigationBar"];
37+
[self initiateMenuOptions];
4038
}
4139

42-
- (BOOL)prefersStatusBarHidden
43-
{
40+
- (BOOL)prefersStatusBarHidden {
4441
return YES;
4542
}
4643

@@ -143,4 +140,4 @@ - (UITableViewCell *)tableView:(YALContextMenuTableView *)tableView cellForRowAt
143140
return cell;
144141
}
145142

146-
@end
143+
@end

‎YALContextMenu/YALContextMenuTableView.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ - (void)showInView:(UIView *)superview withEdgeInsets:(UIEdgeInsets)edgeInsets a
8282
}
8383

8484
self.dismissalIndexpath = nil;
85+
self.frame = superview.bounds;
8586

8687
[superview addSubViewiew:self withSidesConstrainsInsets:edgeInsets];
8788

0 commit comments

Comments
 (0)