vlc | branch: master | Felix Paul Kühne <[email protected]> | Sat Jul 1 19:19:05 2017 +0200| [0a40c60e3dc0536b91e6e6abbf906bb2deda5e04] | committer: Felix Paul Kühne
macosx: fix auto layout in Main Menu > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0a40c60e3dc0536b91e6e6abbf906bb2deda5e04 --- modules/gui/macosx/UI/MainMenu.xib | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/modules/gui/macosx/UI/MainMenu.xib b/modules/gui/macosx/UI/MainMenu.xib index 44878987e0..6095ff894b 100644 --- a/modules/gui/macosx/UI/MainMenu.xib +++ b/modules/gui/macosx/UI/MainMenu.xib @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1421" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <deployment identifier="macosx"/> + <deployment version="1070" identifier="macosx"/> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="VLCMainMenu"> @@ -963,16 +963,13 @@ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <subviews> <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4597"> - <rect key="frame" x="28" y="3" width="261" height="16"/> - <constraints> - <constraint firstAttribute="width" constant="261" id="mPU-3b-J9E"/> - </constraints> + <rect key="frame" x="28" y="4" width="261" height="15"/> <sliderCell key="cell" controlSize="mini" continuous="YES" enabled="NO" state="on" alignment="left" minValue="-34" maxValue="34" tickMarkPosition="above" numberOfTickMarks="17" sliderType="linear" id="4605"/> <connections> <action selector="setPlaybackRate:" target="-2" id="hdX-mB-WKd"/> </connections> </slider> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4600"> + <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4600"> <rect key="frame" x="26" y="19" width="40" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Slower" id="4602"> <font key="font" metaFont="smallSystem"/> @@ -980,7 +977,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4599"> + <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4599"> <rect key="frame" x="254" y="19" width="37" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Faster" id="4603"> <font key="font" metaFont="smallSystem"/> @@ -988,7 +985,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4598"> + <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4598"> <rect key="frame" x="136" y="19" width="46" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Normal" id="4604"> <font key="font" metaFont="smallSystem"/> @@ -1002,7 +999,7 @@ <constraint firstAttribute="height" constant="8" id="3TW-kT-FcC"/> </constraints> </box> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4615"> + <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4615"> <rect key="frame" x="19" y="35" width="108" height="18"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="Playback Speed" id="4616"> <font key="font" metaFont="system" size="14"/> @@ -1010,7 +1007,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4617"> + <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4617"> <rect key="frame" x="273" y="35" width="18" height="18"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1x" id="4618"> <font key="font" metaFont="system" size="14"/> @@ -1020,19 +1017,25 @@ </textField> </subviews> <constraints> + <constraint firstAttribute="trailing" secondItem="4597" secondAttribute="trailing" constant="18" id="0mI-WU-Hft"/> <constraint firstItem="4615" firstAttribute="leading" secondItem="4597" secondAttribute="leading" constant="-7" id="3bT-I0-wWf"/> <constraint firstItem="4597" firstAttribute="leading" secondItem="4596" secondAttribute="leading" constant="28" id="3eU-xF-bKw"/> <constraint firstItem="4600" firstAttribute="centerY" secondItem="4598" secondAttribute="centerY" id="5aF-Lp-phm"/> <constraint firstItem="4597" firstAttribute="top" secondItem="4601" secondAttribute="bottom" constant="-8" id="5k1-Co-uGX"/> <constraint firstItem="4615" firstAttribute="top" secondItem="4596" secondAttribute="top" id="7KB-Mh-tpE"/> <constraint firstItem="4597" firstAttribute="top" secondItem="4615" secondAttribute="bottom" constant="16" id="8kk-M5-VKI"/> + <constraint firstItem="4598" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4596" secondAttribute="leading" constant="17" id="DE9-Iq-xv0"/> + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="4615" secondAttribute="trailing" constant="182" id="Orx-9E-hkb"/> <constraint firstItem="4617" firstAttribute="centerY" secondItem="4615" secondAttribute="centerY" id="Qtz-HV-35I"/> + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="4600" secondAttribute="trailing" constant="17" id="VaO-P3-Lcc"/> <constraint firstItem="4600" firstAttribute="centerY" secondItem="4599" secondAttribute="centerY" id="acy-Wj-eHh"/> <constraint firstItem="4617" firstAttribute="trailing" secondItem="4597" secondAttribute="trailing" id="d6x-PQ-pfq"/> <constraint firstItem="4598" firstAttribute="centerX" secondItem="4597" secondAttribute="centerX" id="dVp-4U-EiF"/> <constraint firstItem="4601" firstAttribute="centerX" secondItem="4597" secondAttribute="centerX" id="gAy-Wg-VLj"/> + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="4598" secondAttribute="trailing" constant="17" id="nMl-yc-nVG"/> <constraint firstItem="4597" firstAttribute="top" secondItem="4600" secondAttribute="bottom" id="uku-8k-K3D"/> <constraint firstItem="4599" firstAttribute="trailing" secondItem="4597" secondAttribute="trailing" id="wQZ-1a-DAZ"/> + <constraint firstItem="4599" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4596" secondAttribute="leading" constant="17" id="xOK-OP-wcl"/> <constraint firstItem="4600" firstAttribute="leading" secondItem="4597" secondAttribute="leading" id="zGp-3d-2RP"/> </constraints> </customView> @@ -1041,16 +1044,13 @@ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <subviews> <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5555"> - <rect key="frame" x="28" y="1" width="261" height="16"/> - <constraints> - <constraint firstAttribute="width" constant="261" id="Hu0-CJ-jYl"/> - </constraints> + <rect key="frame" x="28" y="2" width="261" height="15"/> <sliderCell key="cell" controlSize="mini" continuous="YES" enabled="NO" state="on" alignment="left" maxValue="255" tickMarkPosition="above" numberOfTickMarks="17" sliderType="linear" id="5556"/> <connections> <action selector="switchSubtitleBackgroundOpacity:" target="-2" id="mIi-V5-gqn"/> </connections> </slider> - <textField hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5550"> + <textField hidden="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5550"> <rect key="frame" x="19" y="20" width="133" height="18"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="Background opacity" id="5560"> <font key="font" metaFont="system" size="14"/> @@ -1058,7 +1058,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5548"> + <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5548"> <rect key="frame" x="19" y="20" width="133" height="18"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" enabled="NO" sendsActionOnEndEditing="YES" title="Background opacity" id="5562"> <font key="font" metaFont="system" size="14"/> @@ -1073,6 +1073,9 @@ <constraint firstItem="5550" firstAttribute="width" secondItem="5548" secondAttribute="width" id="5Y0-GK-4Jr"/> <constraint firstItem="5550" firstAttribute="top" secondItem="5547" secondAttribute="top" constant="1" id="A0A-U4-c70"/> <constraint firstItem="5550" firstAttribute="height" secondItem="5548" secondAttribute="height" id="ARP-iB-hpr"/> + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5550" secondAttribute="trailing" constant="17" id="AjR-Ja-Kwu"/> + <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="5548" secondAttribute="trailing" constant="17" id="QDr-TS-Anv"/> + <constraint firstAttribute="trailing" secondItem="5555" secondAttribute="trailing" constant="20" id="WG2-ZC-N9x"/> <constraint firstItem="5548" firstAttribute="centerX" secondItem="5550" secondAttribute="centerX" id="ZTn-Vv-gdG"/> <constraint firstItem="5555" firstAttribute="leading" secondItem="5547" secondAttribute="leading" constant="28" id="abd-YT-hbw"/> <constraint firstItem="5548" firstAttribute="centerY" secondItem="5550" secondAttribute="centerY" id="jed-zg-Ueg"/> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
