Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-25300] (6_3_X) iOS 11: Fix title-control in landscape #9523

Merged
merged 2 commits into from Oct 16, 2017
Merged

[TIMOB-25300] (6_3_X) iOS 11: Fix title-control in landscape #9523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cecef1c
[TIMOB-25300] Fix title-control in landscape
hansemannn Oct 12, 2017
ccae096
Fix launch-screen size
hansemannn Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion iphone/Classes/TiUIWindowProxy.m
View file
Open in desktop
Expand Up @@ -755,7 +755,7 @@ -(void)updateTitleView
#ifndef TI_USE_AUTOLAYOUT
barBounds.size = SizeConstraintViewWithSizeAddingResizing(titleControl.layoutProperties, titleControl, availableTitleSize, NULL);
#endif
[TiUtils setView:oldView positionRect:[TiUtils centerRect:barBounds inRect:barFrame]];
[oldView setBounds:barBounds];
[oldView setAutoresizingMask:UIViewAutoresizingNone];

//layout the titleControl children
Expand Down
16 changes: 7 additions & 9 deletions iphone/iphone/LaunchScreen.storyboard
View file
Open in desktop
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_9" orientation="portrait">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -24,17 +22,17 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="300" verticalHuggingPriority="300" image="LaunchLogo" translatesAutoresizingMaskIntoConstraints="NO" id="oLO-hJ-nXs">
<rect key="frame" x="145" y="350" width="300" height="300"/>
<rect key="frame" x="195" y="400" width="200" height="200"/>
<constraints>
<constraint firstAttribute="width" secondItem="oLO-hJ-nXs" secondAttribute="height" multiplier="1:1" id="WVj-BT-r9U"/>
<constraint firstAttribute="height" constant="200" id="87N-iP-nIL"/>
<constraint firstAttribute="width" constant="200" id="jn3-gM-Mg5"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="oLO-hJ-nXs" firstAttribute="width" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="1:2" constant="5" id="b7h-ZE-BfJ"/>
<constraint firstItem="oLO-hJ-nXs" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="bxl-7H-1iT"/>
<constraint firstItem="oLO-hJ-nXs" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="cbb-2w-Q6H"/>
<constraint firstItem="oLO-hJ-nXs" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="bii-1K-wwj"/>
<constraint firstItem="oLO-hJ-nXs" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="dlR-Uh-Lqz"/>
</constraints>
</view>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
Expand All @@ -46,6 +44,6 @@
</scene>
</scenes>
<resources>
<image name="LaunchLogo" width="207" height="207"/>
<image name="LaunchLogo" width="187" height="187"/>
</resources>
</document>