vlc | branch: master | Marvin Scholz <[email protected]> | Thu Nov 3 15:38:23 2016 +0100| [105377d6f547b936f4b8c32c15d3a4d05ec24fa2] | committer: Marvin Scholz
macosx: Disable custom fscontroller height on <10.10 to fix hang Due to auto layout issues the fullscreen controller window would use a huge height on some older OS X versions (tested on 10.7), which would cause rendering some controls to hang. As a quick fix, this commit disables the possibility to adjust the height on OS X versions lower than 10.10. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=105377d6f547b936f4b8c32c15d3a4d05ec24fa2 --- .../macosx/Resources/English.lproj/VLCFullScreenPanel.xib | 9 ++++++--- modules/gui/macosx/VLCFSPanelController.h | 2 ++ modules/gui/macosx/VLCFSPanelController.m | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/VLCFullScreenPanel.xib b/extras/package/macosx/Resources/English.lproj/VLCFullScreenPanel.xib index 967d70b..382f222 100644 --- a/extras/package/macosx/Resources/English.lproj/VLCFullScreenPanel.xib +++ b/extras/package/macosx/Resources/English.lproj/VLCFullScreenPanel.xib @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/> <capability name="Aspect ratio constraints" minToolsVersion="5.1"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/> </dependencies> <objects> @@ -13,6 +14,7 @@ <outlet property="controlsView" destination="Npt-C5-K77" id="Dnt-ku-O6u"/> <outlet property="elapsedTime" destination="nJc-M4-sMF" id="DFf-yw-e6A"/> <outlet property="forwardButton" destination="jSN-hV-r5D" id="3PN-jP-xPY"/> + <outlet property="heightMaxConstraint" destination="Vwe-uz-fKC" id="yz0-Rh-MKt"/> <outlet property="mediaTitle" destination="Vd8-0f-Usz" id="NZ0-KY-l4T"/> <outlet property="nextButton" destination="2ai-dB-Wpq" id="Axl-RO-LfI"/> <outlet property="playPauseButton" destination="YSL-bH-k6U" id="I6W-Cy-q85"/> @@ -151,6 +153,7 @@ <constraint firstAttribute="bottom" secondItem="TVM-DT-2yo" secondAttribute="bottom" constant="7" id="RYT-zW-Br7"/> <constraint firstItem="2ai-dB-Wpq" firstAttribute="top" secondItem="VLH-qy-cwr" secondAttribute="top" constant="6" id="SQA-fK-Mpa"/> <constraint firstItem="TVM-DT-2yo" firstAttribute="leading" secondItem="Ihl-7x-5mN" secondAttribute="trailing" priority="250" constant="20" id="UBD-5x-a7g"/> + <constraint firstAttribute="height" relation="lessThanOrEqual" constant="52" identifier="customViewHeightMax" id="Vwe-uz-fKC"/> <constraint firstAttribute="bottom" secondItem="YSL-bH-k6U" secondAttribute="bottom" constant="7" id="Wu7-Pv-Dqf"/> <constraint firstItem="TVM-DT-2yo" firstAttribute="top" secondItem="VLH-qy-cwr" secondAttribute="top" constant="6" id="YDA-hw-CAe"/> <constraint firstAttribute="bottom" secondItem="2ai-dB-Wpq" secondAttribute="bottom" constant="7" id="ae5-nP-phG"/> @@ -217,7 +220,7 @@ <constraints> <constraint firstItem="T3x-es-c7v" firstAttribute="leading" secondItem="Vd8-0f-Usz" secondAttribute="trailing" constant="5" id="1vL-HQ-doh"/> <constraint firstItem="VLH-qy-cwr" firstAttribute="leading" secondItem="Npt-C5-K77" secondAttribute="leading" id="AXK-9N-Zst"/> - <constraint firstItem="VLH-qy-cwr" firstAttribute="top" secondItem="Npt-C5-K77" secondAttribute="top" constant="38" id="FRE-MB-iBT"/> + <constraint firstItem="VLH-qy-cwr" firstAttribute="top" secondItem="Npt-C5-K77" secondAttribute="top" priority="750" constant="38" id="FRE-MB-iBT"/> <constraint firstItem="f9T-Kg-gn6" firstAttribute="leading" secondItem="Npt-C5-K77" secondAttribute="leading" constant="20" id="Ibl-1I-f2u"/> <constraint firstItem="f9T-Kg-gn6" firstAttribute="top" secondItem="Npt-C5-K77" secondAttribute="top" constant="25" id="N8D-Lc-aKn"/> <constraint firstItem="f9T-Kg-gn6" firstAttribute="top" secondItem="nJc-M4-sMF" secondAttribute="bottom" constant="2" id="Pix-DL-2C0"/> diff --git a/modules/gui/macosx/VLCFSPanelController.h b/modules/gui/macosx/VLCFSPanelController.h index 10a098d..670b49a 100644 --- a/modules/gui/macosx/VLCFSPanelController.h +++ b/modules/gui/macosx/VLCFSPanelController.h @@ -46,6 +46,8 @@ @property IBOutlet NSSlider *timeSlider; @property IBOutlet NSSlider *volumeSlider; +@property (assign) IBOutlet NSLayoutConstraint *heightMaxConstraint; + - (IBAction)togglePlayPause:(id)sender; - (IBAction)jumpForward:(id)sender; - (IBAction)jumpBackward:(id)sender; diff --git a/modules/gui/macosx/VLCFSPanelController.m b/modules/gui/macosx/VLCFSPanelController.m index 9bc23ee..60ec434 100644 --- a/modules/gui/macosx/VLCFSPanelController.m +++ b/modules/gui/macosx/VLCFSPanelController.m @@ -404,6 +404,11 @@ /* Inject view in view hierarchy */ [self.window setContentView:view]; [self.window.contentView addSubview:_controlsView]; + + /* Disable adjusting height to workaround autolayout problems */ + [_heightMaxConstraint setConstant:42.0]; + [self.window setMaxSize:NSMakeSize(4068, 80)]; + [self.window setMinSize:NSMakeSize(480, 80)]; } - (void)dealloc _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
