MacGui: fix an aligmented issue in the width and height textfields.

2 files changed, 91 insertions, 91 deletions

diff --git a/macosx/Base.lproj/AddPreset.xib b/macosx/Base.lproj/AddPreset.xib
index 85d7693a6..ab6e6da7b 100644
--- a/macosx/Base.lproj/AddPreset.xib
+++ b/macosx/Base.lproj/AddPreset.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,7 +14,7 @@
                 <outlet property="picHeight" destination="Mga-dS-8BF" id="blD-Jx-MtN"/>
                 <outlet property="picSettingsPopUp" destination="z6B-ig-ouq" id="Nxq-Lm-dmh"/>
                 <outlet property="picWidth" destination="gOg-oO-8ar" id="oOu-qH-C4Q"/>
-                <outlet property="picWidthHeightBox" destination="H9n-64-GXz" id="aUH-bq-e2x"/>
+                <outlet property="picWidthHeightBox" destination="WqV-1O-lgv" id="Qa3-Xw-nzw"/>
                 <outlet property="window" destination="dbZ-Wo-9nG" id="BGs-m9-Ptx"/>
             </connections>
         </customObject>
@@ -23,23 +23,23 @@
         <window title="New Preset" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="dbZ-Wo-9nG" userLabel="AddPresetPanel">
             <windowStyleMask key="styleMask" titled="YES" resizable="YES"/>
             <rect key="contentRect" x="421" y="536" width="480" height="239"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
-            <view key="contentView" misplaced="YES" id="AcO-9f-fnb">
-                <rect key="frame" x="0.0" y="0.0" width="480" height="239"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <view key="contentView" id="AcO-9f-fnb">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="247"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="Wy7-cF-tGv">
-                        <rect key="frame" x="18" y="211" width="75" height="14"/>
+                        <rect key="frame" x="18" y="210" width="75" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Preset Name:" id="jhj-Et-ncF">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="Wpk-WC-aVk">
-                        <rect key="frame" x="18" y="103" width="75" height="14"/>
+                        <rect key="frame" x="18" y="104" width="75" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Dimensions:" id="75B-xq-Qbe">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -47,7 +47,7 @@
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="YVc-5E-NjK">
                         <rect key="frame" x="18" y="76" width="75" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Audio:" id="HKp-K9-MF4">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -55,7 +55,7 @@
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="ubZ-rD-tIS">
                         <rect key="frame" x="18" y="48" width="75" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Subtitles:" id="OYE-GG-Vo3">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -63,16 +63,16 @@
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="zDq-QP-LAu">
                         <rect key="frame" x="18" y="186" width="75" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Description:" id="hc8-1h-Jye">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fLU-xs-0du">
-                        <rect key="frame" x="403" y="14" width="62" height="28"/>
+                        <rect key="frame" x="403" y="14" width="62" height="27"/>
                         <buttonCell key="cell" type="push" title="Add" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="Deg-rS-mRc">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
@@ -82,10 +82,10 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Y03-Ts-ZA4">
-                        <rect key="frame" x="343" y="14" width="62" height="28"/>
+                        <rect key="frame" x="343" y="14" width="62" height="27"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="5Xb-gz-QEa">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <string key="keyEquivalent" base64-UTF8="YES">
 Gw
 </string>
@@ -101,7 +101,7 @@ Gw
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="38" id="2sm-hv-l5W"/>
                         </constraints>
                         <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="HKY-Cq-VyU">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -110,10 +110,10 @@ Gw
                         </connections>
                     </textField>
                     <button toolTip="Selection Behavior determines the track(s) and settings used when the preset is selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aez-2b-JXx">
-                        <rect key="frame" x="94" y="68" width="132" height="28"/>
+                        <rect key="frame" x="94" y="68" width="132" height="27"/>
                         <buttonCell key="cell" type="push" title="Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="a0j-nw-n23">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                         </buttonCell>
                         <connections>
                             <action selector="showAudioSettingsSheet:" target="-2" id="Rrt-QI-5hD"/>
@@ -122,7 +122,7 @@ Gw
                     <textField toolTip="Enter a name for the new preset. This name will be displayed in the presets list." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aKg-n4-OUS">
                         <rect key="frame" x="99" y="208" width="361" height="19"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="xe0-bj-f3Z">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -130,70 +130,18 @@ Gw
                             <accessibilityConnection property="title" destination="Wy7-cF-tGv" id="qbt-Xs-S0o"/>
                         </connections>
                     </textField>
-                    <box autoresizesSubviews="NO" boxType="custom" borderType="none" borderWidth="0.0" title="Box" titlePosition="noTitle" transparent="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H9n-64-GXz">
-                        <rect key="frame" x="128" y="96" width="300" height="24"/>
-                        <view key="contentView" id="YlE-Da-0Vn">
-                            <rect key="frame" x="0.0" y="0.0" width="300" height="24"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <textField toolTip="Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gOg-oO-8ar">
-                                    <rect key="frame" x="5" y="4" width="52" height="19"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="52" id="T8n-Ik-Oc2"/>
-                                    </constraints>
-                                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="ExG-3m-WxY">
-                                        <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Rn4-AK-xTD"/>
-                                        <font key="font" metaFont="smallSystem"/>
-                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                    <accessibility description="Picture Width"/>
-                                </textField>
-                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="25" translatesAutoresizingMaskIntoConstraints="NO" id="mQk-Ua-wzc">
-                                    <rect key="frame" x="57" y="7" width="29" height="14"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="25" id="Zwp-Kv-7lL"/>
-                                    </constraints>
-                                    <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" title="x" id="Nfk-ix-xIv">
-                                        <font key="font" metaFont="smallSystem"/>
-                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                </textField>
-                                <textField toolTip="Maximum video storage height in pixels allowed by the preset. Set to 0 for unlimited height." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mga-dS-8BF">
-                                    <rect key="frame" x="86" y="4" width="52" height="19"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="52" id="4os-w4-V7L"/>
-                                    </constraints>
-                                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="tBe-1m-0r9">
-                                        <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Udu-cs-fdK"/>
-                                        <font key="font" metaFont="smallSystem"/>
-                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                    </textFieldCell>
-                                    <accessibility description="PictureHeight"/>
-                                </textField>
-                            </subviews>
-                            <constraints>
-                                <constraint firstItem="mQk-Ua-wzc" firstAttribute="baseline" secondItem="Mga-dS-8BF" secondAttribute="baseline" id="244-dZ-Vqk"/>
-                                <constraint firstItem="gOg-oO-8ar" firstAttribute="baseline" secondItem="mQk-Ua-wzc" secondAttribute="baseline" id="7SB-MS-5xj"/>
-                                <constraint firstItem="Mga-dS-8BF" firstAttribute="leading" secondItem="mQk-Ua-wzc" secondAttribute="trailing" constant="2" id="q50-Bh-ZPu"/>
-                                <constraint firstItem="mQk-Ua-wzc" firstAttribute="leading" secondItem="gOg-oO-8ar" secondAttribute="trailing" constant="2" id="t2E-u9-OPx"/>
-                            </constraints>
-                        </view>
-                    </box>
                     <button toolTip="Selection Behavior determines the track(s) and settings used when the preset is selected." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nWJ-0b-fUA">
-                        <rect key="frame" x="94" y="40" width="132" height="28"/>
+                        <rect key="frame" x="94" y="40" width="132" height="27"/>
                         <buttonCell key="cell" type="push" title="Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="LPX-Rc-KLa">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                         </buttonCell>
                         <connections>
                             <action selector="showSubtitlesSettingsSheet:" target="-2" id="JMG-mN-fAT"/>
                         </connections>
                     </button>
                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z6B-ig-ouq">
-                        <rect key="frame" x="96" y="99" width="34" height="22"/>
+                        <rect key="frame" x="96" y="99" width="36" height="22"/>
                         <string key="toolTip">Picture Size controls how video dimensions are applied when selecting the preset.
 
 None uses the currently set dimensions.
@@ -203,7 +151,7 @@ Custom allows you to set a maximum width and/or height.
 Source maximum uses the full dimensions of each source.</string>
                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="Mi7-V1-sSf">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <menu key="menu" title="OtherViews" id="qsA-gt-zdK"/>
                         </popUpButtonCell>
                         <connections>
@@ -212,10 +160,10 @@ Source maximum uses the full dimensions of each source.</string>
                         </connections>
                     </popUpButton>
                     <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AWD-QF-ZQB">
-                        <rect key="frame" x="18" y="17" width="22" height="22"/>
+                        <rect key="frame" x="20" y="19" width="18" height="19"/>
                         <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="bqf-TZ-JzM">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                         </buttonCell>
                         <connections>
                             <action selector="openUserGuide:" target="-2" id="CPW-1S-pHx"/>
@@ -224,13 +172,13 @@ Source maximum uses the full dimensions of each source.</string>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="f1M-Sg-uDB">
                         <rect key="frame" x="18" y="138" width="75" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Category:" id="IyE-Lz-32s">
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bma-pS-phM">
-                        <rect key="frame" x="96" y="133" width="175" height="22"/>
+                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bma-pS-phM">
+                        <rect key="frame" x="96" y="133" width="119" height="22"/>
                         <string key="toolTip">Picture Size controls how video dimensions are applied when selecting the preset.
 
 None uses the currently set dimensions.
@@ -240,7 +188,7 @@ Custom allows you to set a maximum width and/or height.
 Source maximum uses the full dimensions of each source.</string>
                         <popUpButtonCell key="cell" type="push" title="New Category…" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="Sf8-HP-mhE" id="mZR-uO-YA8">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="smallSystem"/>
+                            <font key="font" metaFont="controlContent" size="11"/>
                             <menu key="menu" title="OtherViews" id="tQ1-PN-kvh">
                                 <items>
                                     <menuItem title="New Category…" state="on" id="Sf8-HP-mhE">
@@ -257,26 +205,78 @@ Source maximum uses the full dimensions of each source.</string>
                             <accessibilityConnection property="title" destination="f1M-Sg-uDB" id="cMn-eW-Mml"/>
                         </connections>
                     </popUpButton>
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="WqV-1O-lgv">
+                        <rect key="frame" x="137" y="102" width="133" height="19"/>
+                        <subviews>
+                            <textField toolTip="Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gOg-oO-8ar">
+                                <rect key="frame" x="0.0" y="0.0" width="52" height="19"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="52" id="T8n-Ik-Oc2"/>
+                                </constraints>
+                                <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="ExG-3m-WxY">
+                                    <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Rn4-AK-xTD"/>
+                                    <font key="font" metaFont="controlContent" size="11"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                                <accessibility description="Picture Width"/>
+                            </textField>
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="25" translatesAutoresizingMaskIntoConstraints="NO" id="mQk-Ua-wzc">
+                                <rect key="frame" x="52" y="2" width="29" height="14"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="25" id="Zwp-Kv-7lL"/>
+                                </constraints>
+                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" title="x" id="Nfk-ix-xIv">
+                                    <font key="font" metaFont="controlContent" size="11"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <textField toolTip="Maximum video storage height in pixels allowed by the preset. Set to 0 for unlimited height." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mga-dS-8BF">
+                                <rect key="frame" x="81" y="0.0" width="52" height="19"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="52" id="4os-w4-V7L"/>
+                                </constraints>
+                                <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="tBe-1m-0r9">
+                                    <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Udu-cs-fdK"/>
+                                    <font key="font" metaFont="controlContent" size="11"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                                <accessibility description="Picture Height"/>
+                            </textField>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="Mga-dS-8BF" firstAttribute="leading" secondItem="mQk-Ua-wzc" secondAttribute="trailing" constant="2" id="21N-N7-j2D"/>
+                            <constraint firstItem="gOg-oO-8ar" firstAttribute="leading" secondItem="WqV-1O-lgv" secondAttribute="leading" id="2Oe-1Z-zn4"/>
+                            <constraint firstItem="mQk-Ua-wzc" firstAttribute="leading" secondItem="gOg-oO-8ar" secondAttribute="trailing" constant="2" id="6NB-50-eLt"/>
+                            <constraint firstItem="gOg-oO-8ar" firstAttribute="baseline" secondItem="mQk-Ua-wzc" secondAttribute="baseline" id="Vd5-tp-zSH"/>
+                            <constraint firstItem="mQk-Ua-wzc" firstAttribute="baseline" secondItem="Mga-dS-8BF" secondAttribute="baseline" id="cxJ-2G-46R"/>
+                            <constraint firstAttribute="bottom" secondItem="gOg-oO-8ar" secondAttribute="bottom" id="qle-88-xLV"/>
+                            <constraint firstAttribute="trailing" secondItem="Mga-dS-8BF" secondAttribute="trailing" id="wZV-KE-Yqc"/>
+                            <constraint firstItem="gOg-oO-8ar" firstAttribute="top" secondItem="WqV-1O-lgv" secondAttribute="top" id="xky-gd-k1o"/>
+                        </constraints>
+                    </customView>
                 </subviews>
                 <constraints>
                     <constraint firstItem="fLU-xs-0du" firstAttribute="baseline" secondItem="Y03-Ts-ZA4" secondAttribute="baseline" id="0EW-fw-JLy"/>
                     <constraint firstItem="ubZ-rD-tIS" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="0wx-gx-gb8"/>
+                    <constraint firstItem="Y03-Ts-ZA4" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="AWD-QF-ZQB" secondAttribute="trailing" constant="12" symbolic="YES" id="1L0-dB-Hne"/>
                     <constraint firstItem="aez-2b-JXx" firstAttribute="baseline" secondItem="YVc-5E-NjK" secondAttribute="baseline" id="4Q5-W8-cDd"/>
                     <constraint firstItem="aez-2b-JXx" firstAttribute="top" secondItem="z6B-ig-ouq" secondAttribute="bottom" constant="10" id="4Z4-Zb-Xaa"/>
-                    <constraint firstItem="H9n-64-GXz" firstAttribute="centerY" secondItem="z6B-ig-ouq" secondAttribute="centerY" constant="3" id="5tq-QZ-6b1"/>
-                    <constraint firstItem="H9n-64-GXz" firstAttribute="leading" secondItem="z6B-ig-ouq" secondAttribute="trailing" constant="1" id="7Vw-nX-giB"/>
                     <constraint firstItem="f1M-Sg-uDB" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="8Er-0i-D3o"/>
                     <constraint firstItem="Y03-Ts-ZA4" firstAttribute="top" secondItem="nWJ-0b-fUA" secondAttribute="bottom" constant="8" id="8xO-Rb-whc"/>
-                    <constraint firstAttribute="trailing" secondItem="H9n-64-GXz" secondAttribute="trailing" constant="52" id="E4M-1Z-GXf"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="nWJ-0b-fUA" secondAttribute="trailing" constant="20" symbolic="YES" id="Dxw-48-UuO"/>
                     <constraint firstAttribute="trailing" secondItem="aKg-n4-OUS" secondAttribute="trailing" constant="20" id="Hax-Id-7bg"/>
                     <constraint firstAttribute="bottom" secondItem="AWD-QF-ZQB" secondAttribute="bottom" constant="20" id="INj-Gy-SO5"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="WqV-1O-lgv" secondAttribute="trailing" constant="20" symbolic="YES" id="ISG-DS-Gc1"/>
                     <constraint firstItem="bma-pS-phM" firstAttribute="top" secondItem="8kl-Sh-Gh7" secondAttribute="bottom" constant="8" id="JYL-Ce-WbQ"/>
                     <constraint firstItem="bma-pS-phM" firstAttribute="leading" secondItem="f1M-Sg-uDB" secondAttribute="trailing" constant="8" id="Jyh-Yw-1Z8"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="aez-2b-JXx" secondAttribute="trailing" constant="20" symbolic="YES" id="Kiz-49-yID"/>
                     <constraint firstItem="aKg-n4-OUS" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="trailing" constant="8" id="LmP-Ky-GD4"/>
                     <constraint firstItem="f1M-Sg-uDB" firstAttribute="width" secondItem="Wy7-cF-tGv" secondAttribute="width" id="Lnc-rr-Ctp"/>
                     <constraint firstItem="ubZ-rD-tIS" firstAttribute="baseline" secondItem="nWJ-0b-fUA" secondAttribute="baseline" id="M63-1o-d03"/>
                     <constraint firstItem="YVc-5E-NjK" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="MIg-nV-B3M"/>
-                    <constraint firstItem="gOg-oO-8ar" firstAttribute="leading" secondItem="z6B-ig-ouq" secondAttribute="trailing" constant="6" id="Mbf-ar-zbc"/>
                     <constraint firstItem="zDq-QP-LAu" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="NgL-7U-KIJ"/>
                     <constraint firstItem="z6B-ig-ouq" firstAttribute="leading" secondItem="Wpk-WC-aVk" secondAttribute="trailing" constant="8" id="OwF-Ej-M37"/>
                     <constraint firstItem="bma-pS-phM" firstAttribute="baseline" secondItem="f1M-Sg-uDB" secondAttribute="baseline" id="PH8-7Q-ncB"/>
@@ -286,16 +286,16 @@ Source maximum uses the full dimensions of each source.</string>
                     <constraint firstItem="Wy7-cF-tGv" firstAttribute="width" secondItem="zDq-QP-LAu" secondAttribute="width" id="T9T-JL-zqq"/>
                     <constraint firstItem="Wpk-WC-aVk" firstAttribute="leading" secondItem="Wy7-cF-tGv" secondAttribute="leading" id="UMW-Tx-m1x"/>
                     <constraint firstItem="fLU-xs-0du" firstAttribute="leading" secondItem="Y03-Ts-ZA4" secondAttribute="trailing" constant="8" id="VOp-hp-vTJ"/>
-                    <constraint firstItem="z6B-ig-ouq" firstAttribute="baseline" secondItem="gOg-oO-8ar" secondAttribute="baseline" id="X7w-dY-03H"/>
                     <constraint firstItem="Y03-Ts-ZA4" firstAttribute="width" secondItem="fLU-xs-0du" secondAttribute="width" id="YYV-wg-58h"/>
                     <constraint firstItem="aKg-n4-OUS" firstAttribute="top" secondItem="AcO-9f-fnb" secondAttribute="top" constant="20" id="ZfQ-ns-Acz"/>
-                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Mga-dS-8BF" secondAttribute="trailing" constant="90" id="d33-fp-0W7"/>
+                    <constraint firstItem="z6B-ig-ouq" firstAttribute="centerY" secondItem="WqV-1O-lgv" secondAttribute="centerY" id="amq-Cd-stB"/>
                     <constraint firstItem="8kl-Sh-Gh7" firstAttribute="leading" secondItem="zDq-QP-LAu" secondAttribute="trailing" constant="8" id="d4Q-TW-lX1"/>
-                    <constraint firstItem="H9n-64-GXz" firstAttribute="bottom" secondItem="z6B-ig-ouq" secondAttribute="bottom" constant="6" id="eKn-iL-cTq"/>
                     <constraint firstItem="nWJ-0b-fUA" firstAttribute="leading" secondItem="ubZ-rD-tIS" secondAttribute="trailing" constant="8" id="frd-Bx-84r"/>
                     <constraint firstItem="AWD-QF-ZQB" firstAttribute="leading" secondItem="AcO-9f-fnb" secondAttribute="leading" constant="20" id="fxg-rD-EDL"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="bma-pS-phM" secondAttribute="trailing" constant="20" symbolic="YES" id="hBe-XL-ver"/>
                     <constraint firstAttribute="trailing" secondItem="fLU-xs-0du" secondAttribute="trailing" constant="20" id="heQ-wd-hk8"/>
                     <constraint firstItem="Wpk-WC-aVk" firstAttribute="width" secondItem="zDq-QP-LAu" secondAttribute="width" id="kPT-Bj-dGk"/>
+                    <constraint firstItem="WqV-1O-lgv" firstAttribute="leading" secondItem="z6B-ig-ouq" secondAttribute="trailing" constant="8" id="kmr-ZD-Uzf"/>
                     <constraint firstItem="Wpk-WC-aVk" firstAttribute="width" secondItem="YVc-5E-NjK" secondAttribute="width" id="mF0-Ky-Lla"/>
                     <constraint firstItem="aez-2b-JXx" firstAttribute="leading" secondItem="YVc-5E-NjK" secondAttribute="trailing" constant="8" id="mcI-hC-pLd"/>
                     <constraint firstItem="8kl-Sh-Gh7" firstAttribute="trailing" secondItem="aKg-n4-OUS" secondAttribute="trailing" id="mfh-7S-iAZ"/>
diff --git a/macosx/HBAddPresetController.m b/macosx/HBAddPresetController.m
index 238361e14..960697f42 100644
--- a/macosx/HBAddPresetController.m
+++ b/macosx/HBAddPresetController.m
@@ -32,7 +32,7 @@ typedef NS_ENUM(NSUInteger, HBAddPresetControllerMode) {
 @property (nonatomic, unsafe_unretained) IBOutlet NSPopUpButton *picSettingsPopUp;
 @property (nonatomic, unsafe_unretained) IBOutlet NSTextField *picWidth;
 @property (nonatomic, unsafe_unretained) IBOutlet NSTextField *picHeight;
-@property (nonatomic, unsafe_unretained) IBOutlet NSBox *picWidthHeightBox;
+@property (nonatomic, unsafe_unretained) IBOutlet NSView *picWidthHeightBox;
 
 @property (nonatomic, strong) HBPreset *preset;
 @property (nonatomic, strong) HBMutablePreset *mutablePreset;