vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sat 
Feb 10 11:53:03 2018 +0100| [d7bad8181341d99e920f84a8ceba329c84a2cb80] | 
committer: Felix Paul Kühne

macosx: Fix priorities for black title bar

This caused huge windows with overly long file names.

(cherry picked from commit dd4d11a5596d8ac28bf6e75ae634a41b1d2c0db3)
Signed-off-by: Felix Paul Kühne <fe...@feepk.net>

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

 modules/gui/macosx/UI/DetachedVideoWindow.xib | 4 ++--
 modules/gui/macosx/UI/MainWindow.xib          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/UI/DetachedVideoWindow.xib 
b/modules/gui/macosx/UI/DetachedVideoWindow.xib
index 821600cb88..b960c0bcea 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="16G29" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="10117" systemVersion="17D47" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="10117"/>
     </dependencies>
@@ -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" 
horizontalCompressionResistancePriority="250" 
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"/>
diff --git a/modules/gui/macosx/UI/MainWindow.xib 
b/modules/gui/macosx/UI/MainWindow.xib
index 2e80369392..7b65391a6c 100644
--- a/modules/gui/macosx/UI/MainWindow.xib
+++ b/modules/gui/macosx/UI/MainWindow.xib
@@ -68,7 +68,7 @@
                                     <action selector="buttonAction:" 
target="4850" id="4915"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" 
translatesAutoresizingMaskIntoConstraints="NO" id="4899" 
customClass="VLCWindowTitleTextField">
+                            <textField verticalHuggingPriority="750" 
horizontalCompressionResistancePriority="250" 
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"/>

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to