[vlc-commits] macosx: Update detached window to use new slider

Marvin Scholz git at videolan.org
Tue Jul 18 21:53:24 CEST 2017


vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Jul 18 16:50:02 2017 +0200| [cae378f2b7bb83e40d344701ffd9100e565d368e] | committer: Marvin Scholz

macosx: Update detached window to use new slider

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cae378f2b7bb83e40d344701ffd9100e565d368e
---

 modules/gui/macosx/UI/DetachedVideoWindow.xib | 67 ++++++++-------------------
 1 file changed, 20 insertions(+), 47 deletions(-)

diff --git a/modules/gui/macosx/UI/DetachedVideoWindow.xib b/modules/gui/macosx/UI/DetachedVideoWindow.xib
index d8a03b18ac..73f47bed2e 100644
--- a/modules/gui/macosx/UI/DetachedVideoWindow.xib
+++ b/modules/gui/macosx/UI/DetachedVideoWindow.xib
@@ -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="778"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
             <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" translatesAutoresizingMaskIntoConstraints="NO" id="28" customClass="VLCWindowTitleTextField">
+                            <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" 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"/>
@@ -163,43 +163,7 @@
                                             <constraint firstAttribute="bottom" secondItem="10" secondAttribute="bottom" id="yGM-Jx-9fD"/>
                                         </constraints>
                                     </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="6" customClass="VLCProgressView">
-                                        <rect key="frame" x="101" y="10" width="157" height="14"/>
-                                        <subviews>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="22" customClass="VLCThreePartImageView">
-                                                <rect key="frame" x="0.0" y="0.0" width="157" height="14"/>
-                                            </customView>
-                                            <progressIndicator hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="21" userLabel="Buffering bar">
-                                                <rect key="frame" x="0.0" y="1" width="157" height="12"/>
-                                            </progressIndicator>
-                                            <customView hidden="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="19" customClass="VLCThreePartImageView">
-                                                <rect key="frame" x="1" y="1" width="60" height="12"/>
-                                            </customView>
-                                            <slider hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="20" customClass="TimeLineSlider">
-                                                <rect key="frame" x="0.0" y="1" width="157" height="15"/>
-                                                <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3260.3068524096384" tickMarkPosition="above" sliderType="linear" id="23">
-                                                    <font key="font" size="12" name="Helvetica"/>
-                                                </sliderCell>
-                                                <connections>
-                                                    <action selector="timeSliderAction:" target="3" id="46"/>
-                                                </connections>
-                                            </slider>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="21" firstAttribute="left" secondItem="6" secondAttribute="left" id="45y-XZ-FLX"/>
-                                            <constraint firstAttribute="height" constant="14" id="KKv-wd-vvV"/>
-                                            <constraint firstAttribute="bottom" secondItem="22" secondAttribute="bottom" id="KQg-pN-jCz"/>
-                                            <constraint firstAttribute="right" secondItem="20" secondAttribute="right" id="Qh6-UD-SRF"/>
-                                            <constraint firstAttribute="right" secondItem="21" secondAttribute="right" id="Ssh-Nl-Rmt"/>
-                                            <constraint firstItem="20" firstAttribute="centerY" secondItem="6" secondAttribute="centerY" constant="-1" id="X9R-F6-nBb"/>
-                                            <constraint firstItem="22" firstAttribute="top" secondItem="6" secondAttribute="top" id="azQ-Cs-Kbk"/>
-                                            <constraint firstItem="22" firstAttribute="left" secondItem="6" secondAttribute="left" id="p2J-jh-4Ae"/>
-                                            <constraint firstAttribute="right" secondItem="22" secondAttribute="right" id="pak-7k-GGR"/>
-                                            <constraint firstItem="20" firstAttribute="left" secondItem="6" secondAttribute="left" id="x4b-hb-HtV"/>
-                                            <constraint firstItem="21" firstAttribute="centerY" secondItem="6" secondAttribute="centerY" id="xFv-KZ-9if"/>
-                                        </constraints>
-                                    </customView>
-                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="VLCTimeField">
+                                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" 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"/>
@@ -214,6 +178,7 @@
                                     <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="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">
@@ -224,15 +189,27 @@
                                             <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="centerY" secondItem="6" secondAttribute="centerY" id="7ZU-On-ZZb"/>
-                                    <constraint firstItem="6" firstAttribute="leading" secondItem="Vae-cT-EEI" secondAttribute="trailing" constant="8" symbolic="YES" id="GU7-gS-983"/>
+                                    <constraint firstItem="9" firstAttribute="leading" secondItem="20" secondAttribute="trailing" constant="8" id="7ak-Mt-KYW"/>
+                                    <constraint firstItem="8" firstAttribute="centerY" secondItem="65" secondAttribute="centerY" id="7yx-e0-WmY"/>
                                     <constraint firstItem="8" firstAttribute="centerY" secondItem="9" secondAttribute="centerY" id="IBe-RR-daQ"/>
                                     <constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" constant="8" id="Kfi-X6-dCb"/>
                                     <constraint firstItem="Vae-cT-EEI" firstAttribute="centerY" secondItem="65" secondAttribute="centerY" id="L8J-t8-eZg"/>
-                                    <constraint firstItem="9" firstAttribute="leading" secondItem="6" secondAttribute="trailing" constant="8" symbolic="YES" id="P5c-gH-8J6"/>
-                                    <constraint firstItem="6" firstAttribute="centerY" secondItem="Vae-cT-EEI" secondAttribute="centerY" id="cvI-P6-Eda"/>
+                                    <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">
@@ -300,12 +277,8 @@
                 <outlet property="forwardButton" destination="12" id="f7L-YR-p1H"/>
                 <outlet property="fullscreenButton" destination="8" id="HTb-D0-BTG"/>
                 <outlet property="playButton" destination="10" id="Gsq-tx-qf3"/>
-                <outlet property="progressBar" destination="21" id="lME-my-FW0"/>
-                <outlet property="progressView" destination="6" id="Z9X-x2-mTB"/>
                 <outlet property="timeField" destination="9" id="uzI-2c-bs3"/>
                 <outlet property="timeSlider" destination="20" id="AFS-sq-vuw"/>
-                <outlet property="timeSliderBackgroundView" destination="22" id="jag-ln-qOC"/>
-                <outlet property="timeSliderGradientView" destination="19" id="3iv-ry-UEy"/>
             </connections>
         </customObject>
     </objects>



More information about the vlc-commits mailing list