From b1779d37f8ba95a78d9d740d8e0952aa81300c3a Mon Sep 17 00:00:00 2001
From: Charlie Qiu <qbowater@gmail.com>
Date: Thu, 2 Mar 2017 22:51:47 +0800
Subject: [PATCH] Fix autolayout constraints of adv proxy panel.

---
 .../Base.lproj/ProxyPreferencesController.xib | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib b/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib
index b8137fe..612480c 100644
--- a/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib
+++ b/ShadowsocksX-NG/Base.lproj/ProxyPreferencesController.xib
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="ProxyPreferencesController" customModule="ShadowsocksX_NG" customModuleProvider="target">
@@ -16,12 +18,12 @@
         <window title="Advanced Proxy Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="503" y="308" width="298" height="311"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="298" height="311"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="al4-wo-BVS">
+                    <button translatesAutoresizingMaskIntoConstraints="NO" id="al4-wo-BVS">
                         <rect key="frame" x="18" y="275" width="262" height="18"/>
                         <buttonCell key="cell" type="check" title="Auto Configure" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="FLv-D9-CRw">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -31,9 +33,9 @@
                             <binding destination="-2" name="value" keyPath="autoConfigureNetworkServices" id="SgV-RH-wUe"/>
                         </connections>
                     </button>
-                    <scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="657-dv-Val">
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="657-dv-Val">
                         <rect key="frame" x="20" y="61" width="258" height="199"/>
-                        <clipView key="contentView" ambiguous="YES" id="i6C-d3-Rpb">
+                        <clipView key="contentView" id="i6C-d3-Rpb">
                             <rect key="frame" x="1" y="1" width="256" height="197"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
@@ -70,7 +72,6 @@
                                     </connections>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="3sC-hI-IvB">
                             <rect key="frame" x="-7" y="-14" width="0.0" height="15"/>
@@ -81,8 +82,11 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ulk-V7-E4w">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ulk-V7-E4w">
                         <rect key="frame" x="203" y="13" width="81" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="pKr-lK-BZO"/>
+                        </constraints>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rWE-M6-TvV">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -94,8 +98,11 @@ DQ
                             <action selector="ok:" target="-2" id="GTx-sb-ino"/>
                         </connections>
                     </button>
-                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NVO-zo-7QI">
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NVO-zo-7QI">
                         <rect key="frame" x="122" y="13" width="81" height="32"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="69" id="tMt-LA-r5K"/>
+                        </constraints>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lsQ-1C-OhG">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -108,6 +115,19 @@ Gw
                         </connections>
                     </button>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="657-dv-Val" firstAttribute="trailing" secondItem="ulk-V7-E4w" secondAttribute="trailing" id="CY9-DO-bdj"/>
+                    <constraint firstItem="NVO-zo-7QI" firstAttribute="baseline" secondItem="ulk-V7-E4w" secondAttribute="baseline" id="Eyr-b9-ZtL"/>
+                    <constraint firstAttribute="bottom" secondItem="NVO-zo-7QI" secondAttribute="bottom" constant="20" symbolic="YES" id="FlW-Sa-FEZ"/>
+                    <constraint firstItem="NVO-zo-7QI" firstAttribute="top" secondItem="657-dv-Val" secondAttribute="bottom" constant="20" symbolic="YES" id="Rmy-NH-TYr"/>
+                    <constraint firstItem="al4-wo-BVS" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="20" symbolic="YES" id="VgE-Fh-JP4"/>
+                    <constraint firstItem="657-dv-Val" firstAttribute="top" secondItem="al4-wo-BVS" secondAttribute="bottom" constant="17" id="YZs-QN-ABC"/>
+                    <constraint firstItem="ulk-V7-E4w" firstAttribute="leading" secondItem="NVO-zo-7QI" secondAttribute="trailing" constant="12" symbolic="YES" id="YdW-u1-0yB"/>
+                    <constraint firstItem="al4-wo-BVS" firstAttribute="leading" secondItem="657-dv-Val" secondAttribute="leading" id="de4-mH-svX"/>
+                    <constraint firstItem="al4-wo-BVS" firstAttribute="trailing" secondItem="657-dv-Val" secondAttribute="trailing" id="fnP-5p-dPB"/>
+                    <constraint firstAttribute="trailing" secondItem="al4-wo-BVS" secondAttribute="trailing" constant="20" symbolic="YES" id="nxt-Hr-6YP"/>
+                    <constraint firstItem="al4-wo-BVS" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="20" symbolic="YES" id="tBQ-Gd-Hhr"/>
+                </constraints>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>