vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Wed Aug 9 19:32:57 2017 +0200| [493bff9a814bb8aa89ec2faf6773b78e16bc4cca] | committer: David Fuhrmann
macosx: Fix disambiguaties in controls bar with autolayout Try to fix disambiguaties by: - Remove optional constraints, instead set width constraint to 0 to hide fullscreen button - Decrease content hugging priority to 200 for slider (this should always expand) - Fix some width constraints in detached window: Each button group does not define a width, but the (sometimes) intrinsic or explicit size define the with of the entire group General fixes: - Order slider in list according to appearance > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=493bff9a814bb8aa89ec2faf6773b78e16bc4cca --- modules/gui/macosx/UI/DetachedVideoWindow.xib | 53 ++++++++------------ modules/gui/macosx/UI/MainWindow.xib | 72 ++++++++++++--------------- modules/gui/macosx/VLCControlsBarCommon.h | 1 + modules/gui/macosx/VLCControlsBarCommon.m | 2 +- 4 files changed, 56 insertions(+), 72 deletions(-) diff --git a/modules/gui/macosx/UI/DetachedVideoWindow.xib b/modules/gui/macosx/UI/DetachedVideoWindow.xib index 73f47bed2e..08d9cf2231 100644 --- a/modules/gui/macosx/UI/DetachedVideoWindow.xib +++ b/modules/gui/macosx/UI/DetachedVideoWindow.xib @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> </dependencies> @@ -15,7 +15,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/> <rect key="contentRect" x="91" y="467" width="363" height="239"/> - <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <view key="contentView" id="4"> <rect key="frame" x="0.0" y="0.0" width="363" height="239"/> <autoresizingMask key="autoresizingMask"/> @@ -78,7 +78,7 @@ <action selector="buttonAction:" target="1" id="55"/> </connections> </button> - <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28" customClass="VLCWindowTitleTextField"> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="28" customClass="VLCWindowTitleTextField"> <rect key="frame" x="65" y="3" width="224" height="17"/> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="VLC media player" allowsEditingTextAttributes="YES" usesSingleLineMode="YES" id="29"> <font key="font" metaFont="system"/> @@ -153,7 +153,7 @@ <constraint firstItem="11" firstAttribute="top" secondItem="Vae-cT-EEI" secondAttribute="top" id="11i-jS-o5W"/> <constraint firstItem="10" firstAttribute="left" secondItem="11" secondAttribute="right" id="496-Ip-nTd"/> <constraint firstItem="10" firstAttribute="top" secondItem="Vae-cT-EEI" secondAttribute="top" id="9Kr-xx-Ssf"/> - <constraint firstAttribute="width" constant="85" id="Ykg-nF-M2h"/> + <constraint firstAttribute="right" secondItem="12" secondAttribute="right" id="KOc-oW-4iH"/> <constraint firstAttribute="height" constant="23" id="bN7-k9-7Iy"/> <constraint firstAttribute="bottom" secondItem="11" secondAttribute="bottom" id="fFe-7J-ver"/> <constraint firstItem="12" firstAttribute="top" secondItem="Vae-cT-EEI" secondAttribute="top" id="gwB-yN-SK0"/> @@ -163,7 +163,19 @@ <constraint firstAttribute="bottom" secondItem="10" secondAttribute="bottom" id="yGM-Jx-9fD"/> </constraints> </customView> - <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="VLCTimeField"> + <slider hidden="YES" horizontalHuggingPriority="200" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="VLCSlider"> + <rect key="frame" x="101" y="10" width="157" height="16"/> + <constraints> + <constraint firstAttribute="height" constant="14" id="MYp-CS-yPe"/> + </constraints> + <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3260.3068524096384" tickMarkPosition="above" sliderType="linear" id="23" customClass="VLCSliderCell"> + <font key="font" size="12" name="Helvetica"/> + </sliderCell> + <connections> + <action selector="timeSliderAction:" target="3" id="46"/> + </connections> + </slider> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="VLCTimeField"> <rect key="frame" x="264" y="11" width="56" height="13"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="EvZ-Sy-m25"/> @@ -178,10 +190,10 @@ <button translatesAutoresizingMaskIntoConstraints="NO" id="8"> <rect key="frame" x="326" y="6" width="29" height="23"/> <constraints> - <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="23" id="EAo-Ez-asf"/> + <constraint firstAttribute="width" constant="29" id="VjW-79-ABX"/> <constraint firstAttribute="height" constant="23" id="fNg-pN-oQw"/> </constraints> - <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="fullscreen-double-buttons" imagePosition="only" alignment="center" alternateImage="fullscreen-double-buttons-pressed" id="17"> + <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="fullscreen-one-button" imagePosition="only" alignment="center" alternateImage="fullscreen-one-button-pressed" id="17"> <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/> <font key="font" metaFont="label"/> </buttonCell> @@ -189,18 +201,6 @@ <action selector="fullscreen:" target="3" id="37"/> </connections> </button> - <slider hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="VLCSlider"> - <rect key="frame" x="101" y="10" width="157" height="16"/> - <constraints> - <constraint firstAttribute="height" constant="14" id="MYp-CS-yPe"/> - </constraints> - <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3260.3068524096384" tickMarkPosition="above" sliderType="linear" id="23" customClass="VLCSliderCell"> - <font key="font" size="12" name="Helvetica"/> - </sliderCell> - <connections> - <action selector="timeSliderAction:" target="3" id="46"/> - </connections> - </slider> </subviews> <constraints> <constraint firstItem="9" firstAttribute="leading" secondItem="20" secondAttribute="trailing" constant="8" id="7ak-Mt-KYW"/> @@ -210,16 +210,6 @@ <constraint firstItem="Vae-cT-EEI" firstAttribute="centerY" secondItem="65" secondAttribute="centerY" id="L8J-t8-eZg"/> <constraint firstItem="20" firstAttribute="centerY" secondItem="65" secondAttribute="centerY" id="QoR-o1-tfE"/> <constraint firstItem="20" firstAttribute="leading" secondItem="Vae-cT-EEI" secondAttribute="trailing" constant="8" id="T6G-xN-FkQ"/> - <constraint firstAttribute="trailing" secondItem="9" secondAttribute="trailing" priority="250" constant="7" id="fzk-WE-wjs"> - <attributedString key="userComments"> - <fragment content="optional constraint if fullscreen button is not there"> - <attributes> - <font key="NSFont" metaFont="smallSystem"/> - <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/> - </attributes> - </fragment> - </attributedString> - </constraint> <constraint firstItem="Vae-cT-EEI" firstAttribute="leading" secondItem="65" secondAttribute="leading" constant="8" id="ju1-w7-CzH"/> <constraint firstItem="8" firstAttribute="leading" secondItem="9" secondAttribute="trailing" constant="8" symbolic="YES" id="qs6-O2-pGr"/> </constraints> @@ -276,6 +266,7 @@ <outlet property="dropView" destination="65" id="9kL-XQ-Akn"/> <outlet property="forwardButton" destination="12" id="f7L-YR-p1H"/> <outlet property="fullscreenButton" destination="8" id="HTb-D0-BTG"/> + <outlet property="fullscreenButtonWidthConstraint" destination="VjW-79-ABX" id="D5Z-dr-RIN"/> <outlet property="playButton" destination="10" id="Gsq-tx-qf3"/> <outlet property="timeField" destination="9" id="uzI-2c-bs3"/> <outlet property="timeSlider" destination="20" id="AFS-sq-vuw"/> @@ -287,8 +278,8 @@ <image name="backward-3btns-pressed" width="29" height="23"/> <image name="forward-3btns" width="29" height="23"/> <image name="forward-3btns-pressed" width="29" height="23"/> - <image name="fullscreen-double-buttons" width="29" height="23"/> - <image name="fullscreen-double-buttons-pressed" width="29" height="23"/> + <image name="fullscreen-one-button" width="29" height="23"/> + <image name="fullscreen-one-button-pressed" width="29" height="23"/> <image name="play" width="27" height="23"/> <image name="play-pressed" width="27" height="23"/> </resources> diff --git a/modules/gui/macosx/UI/MainWindow.xib b/modules/gui/macosx/UI/MainWindow.xib index 02861920a9..4bd27d4bc2 100644 --- a/modules/gui/macosx/UI/MainWindow.xib +++ b/modules/gui/macosx/UI/MainWindow.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G24b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment version="1070" identifier="macosx"/> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> <capability name="box content view" minToolsVersion="7.0"/> </dependencies> <objects> @@ -18,7 +18,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/> <rect key="contentRect" x="53" y="419" width="716" height="333"/> - <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <view key="contentView" id="2"> <rect key="frame" x="0.0" y="0.0" width="716" height="333"/> <autoresizingMask key="autoresizingMask"/> @@ -68,7 +68,7 @@ <action selector="buttonAction:" target="4850" id="4915"/> </connections> </button> - <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4899" customClass="VLCWindowTitleTextField"> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4899" customClass="VLCWindowTitleTextField"> <rect key="frame" x="65" y="3" width="577" height="17"/> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="VLC media player" allowsEditingTextAttributes="YES" usesSingleLineMode="YES" id="4900"> <font key="font" metaFont="system"/> @@ -132,7 +132,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" indentationPerLevel="14" autoresizesOutlineColumn="YES" outlineTableColumn="4717" id="4714" customClass="PXSourceList"> - <rect key="frame" x="0.0" y="0.0" width="236" height="273"/> + <rect key="frame" x="0.0" y="0.0" width="203" height="20"/> <autoresizingMask key="autoresizingMask" widthSizable="YES"/> <size key="intercellSpacing" width="3" height="0.0"/> <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -184,7 +184,7 @@ <rect key="frame" x="0.0" y="-4" width="477" height="27"/> <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="top" imageScaling="axesIndependently" image="topbar_background" id="4693"/> </imageView> - <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5610"> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5610"> <rect key="frame" x="6" y="5" width="33" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="5611"> <font key="font" metaFont="smallSystem"/> @@ -192,7 +192,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <searchField wantsLayer="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5614"> + <searchField wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5614"> <rect key="frame" x="319" y="2" width="150" height="19"/> <constraints> <constraint firstAttribute="width" constant="150" id="AM9-aF-RtQ"/> @@ -232,7 +232,7 @@ <customView translatesAutoresizingMaskIntoConstraints="NO" id="5605" customClass="VLCDragDropView"> <rect key="frame" x="0.0" y="0.0" width="477" height="252"/> <subviews> - <box autoresizesSubviews="NO" borderType="none" title="Box" titlePosition="noTitle" transparent="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4739"> + <box autoresizesSubviews="NO" transparent="YES" title="Box" borderType="none" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="4739"> <rect key="frame" x="89" y="10" width="300" height="230"/> <view key="contentView" id="pxq-Tn-LtA"> <rect key="frame" x="0.0" y="0.0" width="300" height="230"/> @@ -246,7 +246,7 @@ </constraints> <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="dropzone" id="4726"/> </imageView> - <textField verticalHuggingPriority="749" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4727"> + <textField verticalHuggingPriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="4727"> <rect key="frame" x="79" y="69" width="143" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Drop Media here" id="4728"> <font key="font" metaFont="system" size="18"/> @@ -587,7 +587,19 @@ <constraint firstItem="2789" firstAttribute="left" secondItem="4671" secondAttribute="right" id="pEa-Hl-83C"/> </constraints> </customView> - <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4423" customClass="VLCTimeField"> + <slider hidden="YES" horizontalHuggingPriority="200" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4422" customClass="VLCSlider"> + <rect key="frame" x="279" y="10" width="223" height="16"/> + <constraints> + <constraint firstAttribute="height" constant="14" id="JuE-o0-ajo"/> + </constraints> + <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3204.0777439024391" tickMarkPosition="above" sliderType="linear" id="4425" customClass="VLCSliderCell"> + <font key="font" size="12" name="Helvetica"/> + </sliderCell> + <connections> + <action selector="timeSliderAction:" target="5339" id="5370"/> + </connections> + </slider> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4423" customClass="VLCTimeField"> <rect key="frame" x="508" y="11" width="56" height="13"/> <constraints> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="oTA-8E-R2c"/> @@ -655,6 +667,7 @@ <rect key="frame" x="29" y="0.0" width="29" height="23"/> <constraints> <constraint firstAttribute="height" constant="23" id="FTh-fT-exD"/> + <constraint firstAttribute="width" constant="29" id="b6s-NA-bQd"/> </constraints> <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="fullscreen-double-buttons" imagePosition="only" alignment="center" alternateImage="fullscreen-double-buttons-pressed" id="4420"> <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/> @@ -671,31 +684,9 @@ <constraint firstItem="4419" firstAttribute="left" secondItem="3654" secondAttribute="right" id="9Kw-Je-A1t"/> <constraint firstAttribute="bottom" secondItem="3654" secondAttribute="bottom" id="XlS-K9-Hjv"/> <constraint firstItem="3654" firstAttribute="left" secondItem="dff-fl-Mde" secondAttribute="left" id="icO-e8-nXO"/> - <constraint firstAttribute="trailing" secondItem="3654" secondAttribute="trailing" priority="250" id="tdE-3n-EwU"> - <attributedString key="userComments"> - <fragment content="Optional constraint for fs button"> - <attributes> - <font key="NSFont" metaFont="smallSystem"/> - <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/> - </attributes> - </fragment> - </attributedString> - </constraint> <constraint firstAttribute="right" secondItem="4419" secondAttribute="right" id="teb-w0-7R0"/> </constraints> </customView> - <slider hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4422" customClass="VLCSlider"> - <rect key="frame" x="279" y="10" width="223" height="16"/> - <constraints> - <constraint firstAttribute="height" constant="14" id="JuE-o0-ajo"/> - </constraints> - <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3204.0777439024391" tickMarkPosition="above" sliderType="linear" id="4425" customClass="VLCSliderCell"> - <font key="font" size="12" name="Helvetica"/> - </sliderCell> - <connections> - <action selector="timeSliderAction:" target="5339" id="5370"/> - </connections> - </slider> </subviews> <constraints> <constraint firstItem="mrr-Bw-co0" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="5tM-K0-mjZ"/> @@ -792,6 +783,7 @@ <outlet property="effectsButtonWidthConstraint" destination="cE9-ym-9VP" id="ZQQ-m6-t7W"/> <outlet property="forwardButton" destination="3648" id="0bA-YS-tkr"/> <outlet property="fullscreenButton" destination="4419" id="hgS-Tk-jle"/> + <outlet property="fullscreenButtonWidthConstraint" destination="b6s-NA-bQd" id="zsB-tJ-zUh"/> <outlet property="nextButton" destination="HBS-xq-EkN" id="MIO-Ba-jDH"/> <outlet property="nextButtonWidthConstraint" destination="uPv-u5-I21" id="Lsk-Nu-vmn"/> <outlet property="playButton" destination="3571" id="5Mf-48-Ga9"/> @@ -814,14 +806,14 @@ <windowStyleMask key="styleMask" titled="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="265" y="520" width="612" height="157"/> - <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <value key="minSize" type="size" width="612" height="157"/> <value key="maxSize" type="size" width="612" height="159"/> <view key="contentView" id="5266"> <rect key="frame" x="0.0" y="0.0" width="612" height="157"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5275"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5275"> <rect key="frame" x="18" y="120" width="576" height="17"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Subscribe to a podcast" id="5276"> <font key="font" metaFont="systemBold"/> @@ -829,7 +821,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5274"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5274"> <rect key="frame" x="18" y="98" width="576" height="14"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Enter URL of the podcast to subscribe to:" usesSingleLineMode="YES" id="5277"> <font key="font" metaFont="smallSystem"/> @@ -837,7 +829,7 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5289"> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5289"> <rect key="frame" x="20" y="68" width="572" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="5290"> <font key="font" metaFont="system"/> @@ -894,14 +886,14 @@ Gw <windowStyleMask key="styleMask" titled="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="265" y="520" width="612" height="156"/> - <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/> + <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> <value key="minSize" type="size" width="612" height="156"/> <value key="maxSize" type="size" width="612" height="159"/> <view key="contentView" id="5306"> <rect key="frame" x="0.0" y="0.0" width="612" height="156"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5311"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5311"> <rect key="frame" x="18" y="119" width="576" height="17"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Unsubscribe from a podcast" id="5312"> <font key="font" metaFont="systemBold"/> @@ -909,7 +901,7 @@ Gw <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5310"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="572" translatesAutoresizingMaskIntoConstraints="NO" id="5310"> <rect key="frame" x="18" y="97" width="576" height="14"/> <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Select the podcast you would like to unsubscribe from:" usesSingleLineMode="YES" id="5313"> <font key="font" metaFont="smallSystem"/> @@ -1005,6 +997,6 @@ Gw <image name="stop-pressed" width="29" height="23"/> <image name="topbar_background" width="1" height="27"/> <image name="volume-high" width="13" height="11"/> - <image name="volume-low" width="5" height="10"/> + <image name="volume-low" width="5" height="11"/> </resources> </document> diff --git a/modules/gui/macosx/VLCControlsBarCommon.h b/modules/gui/macosx/VLCControlsBarCommon.h index eac80f6df2..af660cb757 100644 --- a/modules/gui/macosx/VLCControlsBarCommon.h +++ b/modules/gui/macosx/VLCControlsBarCommon.h @@ -47,6 +47,7 @@ @property (readwrite, strong) IBOutlet VLCTimeField *timeField; @property (readwrite, strong) IBOutlet NSButton *fullscreenButton; +@property (readwrite, strong) IBOutlet NSLayoutConstraint *fullscreenButtonWidthConstraint; @property (readwrite, strong) IBOutlet VLCThreePartImageView *bottomBarView; diff --git a/modules/gui/macosx/VLCControlsBarCommon.m b/modules/gui/macosx/VLCControlsBarCommon.m index 9c7344a458..05cf41360c 100644 --- a/modules/gui/macosx/VLCControlsBarCommon.m +++ b/modules/gui/macosx/VLCControlsBarCommon.m @@ -129,7 +129,7 @@ // remove fullscreen button for lion fullscreen if (_nativeFullscreenMode) { - [self.fullscreenButton removeFromSuperview]; + self.fullscreenButtonWidthConstraint.constant = 0; } if (config_GetInt(getIntf(), "macosx-show-playback-buttons")) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits