vlc/vlc-3.0 | branch: master | David Fuhrmann <[email protected]> | Sun Jun 3 09:23:50 2018 +0200| [2590915b58fa31e1a91cd54ec4fafc74866f4048] | committer: David Fuhrmann
macosx: remove autolayout for save panel accessory view The current constraints work perfectly fine on macOS >= 10.10, but it crashes on 10.7. Therefore, for that view only, remove autolayout as it is unknown how to fix it. This is for 3.0 branch only. closes #20587 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2590915b58fa31e1a91cd54ec4fafc74866f4048 --- modules/gui/macosx/UI/PlaylistAccessoryView.xib | 41 +++++++++---------------- modules/gui/macosx/VLCMainMenu.h | 2 +- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/modules/gui/macosx/UI/PlaylistAccessoryView.xib b/modules/gui/macosx/UI/PlaylistAccessoryView.xib index 0dd5206aa5..835012a43e 100644 --- a/modules/gui/macosx/UI/PlaylistAccessoryView.xib +++ b/modules/gui/macosx/UI/PlaylistAccessoryView.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="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="17G65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment version="1070" identifier="macosx"/> <development version="7000" identifier="xcode"/> @@ -15,15 +15,17 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/> - <customView id="efm-sw-3Se"> - <rect key="frame" x="0.0" y="0.0" width="369" height="39"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <customView misplaced="YES" id="efm-sw-3Se"> + <rect key="frame" x="0.0" y="0.0" width="471" height="39"/> + <autoresizingMask key="autoresizingMask"/> <subviews> - <customView translatesAutoresizingMaskIntoConstraints="NO" id="1" userLabel="SaveAccessoryView"> - <rect key="frame" x="0.0" y="0.0" width="369" height="39"/> + <customView id="1" userLabel="SaveAccessoryView"> + <rect key="frame" x="0.0" y="0.0" width="471" height="39"/> + <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES"/> <subviews> - <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3"> - <rect key="frame" x="91" y="6" width="267" height="26"/> + <popUpButton verticalHuggingPriority="750" id="3"> + <rect key="frame" x="193" y="6" width="267" height="26"/> + <autoresizingMask key="autoresizingMask"/> <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="4"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="menu"/> @@ -36,32 +38,19 @@ </menu> </popUpButtonCell> </popUpButton> - <textField horizontalHuggingPriority="249" verticalHuggingPriority="900" translatesAutoresizingMaskIntoConstraints="NO" id="2"> - <rect key="frame" x="11" y="11" width="76" height="17"/> - <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="File Format:" usesSingleLineMode="YES" id="9"> + <textField horizontalHuggingPriority="249" verticalHuggingPriority="900" misplaced="YES" id="2"> + <rect key="frame" x="11" y="11" width="178" height="17"/> + <autoresizingMask key="autoresizingMask"/> + <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" title="File Format:" usesSingleLineMode="YES" id="9"> <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> </subviews> - <constraints> - <constraint firstItem="2" firstAttribute="top" secondItem="1" secondAttribute="top" constant="11" id="3a2-5d-kdq"/> - <constraint firstItem="3" firstAttribute="leading" secondItem="2" secondAttribute="trailing" constant="8" id="5s2-Ut-CYG"/> - <constraint firstItem="2" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="13" id="Fe1-XU-wIa"/> - <constraint firstItem="3" firstAttribute="centerY" secondItem="2" secondAttribute="centerY" id="OTX-0S-cmU"/> - <constraint firstAttribute="bottom" secondItem="2" secondAttribute="bottom" constant="11" id="PMa-7j-M4R"/> - <constraint firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="14" id="Rhz-TO-tdh"/> - </constraints> </customView> </subviews> - <constraints> - <constraint firstItem="1" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="efm-sw-3Se" secondAttribute="leading" id="HMJ-hb-goL"/> - <constraint firstItem="1" firstAttribute="centerX" secondItem="efm-sw-3Se" secondAttribute="centerX" id="b3K-3h-BWP"/> - <constraint firstItem="1" firstAttribute="top" secondItem="efm-sw-3Se" secondAttribute="top" id="kfO-Je-Tqf"/> - <constraint firstAttribute="bottom" secondItem="1" secondAttribute="bottom" id="s9i-3i-oRB"/> - <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1" secondAttribute="trailing" id="uQ3-JI-53e"/> - </constraints> + <point key="canvasLocation" x="88.5" y="168.5"/> </customView> </objects> </document> diff --git a/modules/gui/macosx/VLCMainMenu.h b/modules/gui/macosx/VLCMainMenu.h index 926604d474..24d559ba7e 100644 --- a/modules/gui/macosx/VLCMainMenu.h +++ b/modules/gui/macosx/VLCMainMenu.h @@ -205,7 +205,7 @@ @property (readwrite, weak) IBOutlet NSMenuItem *voutMenufullscreen; @property (readwrite, weak) IBOutlet NSMenuItem *voutMenusnapshot; -@property (readwrite, weak) IBOutlet NSView *playlistSaveAccessoryView; +@property (readwrite, strong) IBOutlet NSView *playlistSaveAccessoryView; @property (readwrite, weak) IBOutlet NSPopUpButton *playlistSaveAccessoryPopup; @property (readwrite, weak) IBOutlet NSTextField *playlistSaveAccessoryText; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
