[vlc-commits] macosx: bookmarks panel: Fix layout, set minimum size
David Fuhrmann
git at videolan.org
Sat Sep 30 13:35:45 CEST 2017
vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Sep 30 13:34:52 2017 +0200| [70816fa15d64a5679be5fa5134e7b213ae8cdd49] | committer: David Fuhrmann
macosx: bookmarks panel: Fix layout, set minimum size
Fix layout with translated strings. Set minimum sizes for table
view.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70816fa15d64a5679be5fa5134e7b213ae8cdd49
---
modules/gui/macosx/UI/Bookmarks.xib | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/modules/gui/macosx/UI/Bookmarks.xib b/modules/gui/macosx/UI/Bookmarks.xib
index b23d85cf42..69783e4c4d 100644
--- a/modules/gui/macosx/UI/Bookmarks.xib
+++ b/modules/gui/macosx/UI/Bookmarks.xib
@@ -27,14 +27,14 @@
<window title="Bookmarks" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="bookmarks" animationBehavior="default" id="84" userLabel="Bookmarks" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES" HUD="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="340" y="330" width="540" height="307"/>
+ <rect key="contentRect" x="340" y="330" width="566" height="263"/>
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
<view key="contentView" id="85">
- <rect key="frame" x="0.0" y="0.0" width="540" height="307"/>
+ <rect key="frame" x="0.0" y="0.0" width="566" height="263"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="88">
- <rect key="frame" x="20" y="268" width="98" height="19"/>
+ <rect key="frame" x="20" y="224" width="59" height="19"/>
<buttonCell key="cell" type="roundRect" title="Add" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="89" customClass="VLCHUDButtonCell">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -44,7 +44,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="90">
- <rect key="frame" x="20" y="243" width="98" height="19"/>
+ <rect key="frame" x="20" y="199" width="59" height="19"/>
<buttonCell key="cell" type="roundRect" title="Edit" bezelStyle="roundedRect" alignment="center" enabled="NO" borderStyle="border" inset="2" id="91" customClass="VLCHUDButtonCell">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -54,7 +54,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="92">
- <rect key="frame" x="20" y="218" width="98" height="19"/>
+ <rect key="frame" x="20" y="174" width="59" height="19"/>
<buttonCell key="cell" type="roundRect" title="Remove" bezelStyle="roundedRect" alignment="center" enabled="NO" borderStyle="border" inset="2" id="93" customClass="VLCHUDButtonCell">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -64,7 +64,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="94">
- <rect key="frame" x="20" y="193" width="98" height="19"/>
+ <rect key="frame" x="20" y="149" width="59" height="19"/>
<buttonCell key="cell" type="roundRect" title="Clear" bezelStyle="roundedRect" alignment="center" borderStyle="border" inset="2" id="95" customClass="VLCHUDButtonCell">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -73,14 +73,14 @@
<action selector="clear:" target="-2" id="178"/>
</connections>
</button>
- <scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="107">
- <rect key="frame" x="126" y="20" width="394" height="276"/>
+ <scrollView horizontalCompressionResistancePriority="749" borderType="line" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="107">
+ <rect key="frame" x="87" y="20" width="459" height="232"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="KmY-DA-2er">
- <rect key="frame" x="1" y="1" width="392" height="274"/>
+ <rect key="frame" x="1" y="1" width="457" height="230"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" autosaveColumns="NO" autosaveName="bookmarks-table" headerView="111" id="110" customClass="VLCHUDTableView">
- <rect key="frame" x="0.0" y="0.0" width="392" height="251"/>
+ <rect key="frame" x="0.0" y="0.0" width="457" height="207"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
@@ -99,7 +99,7 @@
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
</tableColumn>
- <tableColumn identifier="time_offset" editable="NO" width="120.984375" minWidth="100" maxWidth="1000" id="113">
+ <tableColumn identifier="time_offset" editable="NO" width="196" minWidth="100" maxWidth="1000" id="113">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Time">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -117,8 +117,12 @@
</subviews>
<color key="backgroundColor" name="controlDarkShadowColor" catalog="System" colorSpace="catalog"/>
</clipView>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Y3p-2z-GZy"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="vLK-mg-OaO"/>
+ </constraints>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="109" customClass="VLCHUDScroller">
- <rect key="frame" x="1" y="260" width="377" height="15"/>
+ <rect key="frame" x="1" y="259" width="148" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="108" customClass="VLCHUDScroller">
@@ -126,7 +130,7 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="111">
- <rect key="frame" x="0.0" y="0.0" width="392" height="23"/>
+ <rect key="frame" x="0.0" y="0.0" width="457" height="23"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
@@ -135,13 +139,13 @@
<constraint firstItem="107" firstAttribute="leading" secondItem="90" secondAttribute="trailing" constant="8" id="9X9-yE-SIP"/>
<constraint firstItem="92" firstAttribute="top" secondItem="90" secondAttribute="bottom" constant="7" id="A88-z3-fCb"/>
<constraint firstAttribute="bottom" secondItem="107" secondAttribute="bottom" constant="20" id="BRp-2T-87k"/>
- <constraint firstItem="107" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="126" id="Eue-hS-z8E"/>
<constraint firstItem="94" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="FOs-iP-fF8"/>
<constraint firstAttribute="trailing" secondItem="107" secondAttribute="trailing" constant="20" id="G5G-Zl-egd"/>
<constraint firstItem="90" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="IQa-1D-B9p"/>
<constraint firstItem="107" firstAttribute="leading" secondItem="88" secondAttribute="trailing" constant="8" id="Ltc-GA-VMt"/>
<constraint firstItem="107" firstAttribute="leading" secondItem="94" secondAttribute="trailing" constant="8" id="N3T-ZA-ej2"/>
<constraint firstItem="88" firstAttribute="top" secondItem="85" secondAttribute="top" constant="20" id="WP1-gk-lha"/>
+ <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="94" secondAttribute="bottom" constant="20" id="eNd-Mr-tyL"/>
<constraint firstItem="92" firstAttribute="leading" secondItem="85" secondAttribute="leading" constant="20" id="epp-d9-CZ3"/>
<constraint firstItem="94" firstAttribute="top" secondItem="92" secondAttribute="bottom" constant="7" id="hSm-2D-FnN"/>
<constraint firstItem="107" firstAttribute="leading" secondItem="92" secondAttribute="trailing" constant="8" id="nMK-MO-8IJ"/>
@@ -150,6 +154,7 @@
<constraint firstItem="107" firstAttribute="top" secondItem="85" secondAttribute="top" constant="11" id="xmY-ER-h97"/>
</constraints>
</view>
+ <point key="canvasLocation" x="261" y="295.5"/>
</window>
<window title="Bookmark inspector" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="133" userLabel="EditBookmarks" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" HUD="YES"/>
More information about the vlc-commits
mailing list