OS X:

Fiddling with XIB constraints.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88251 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 27 insertions, 23 deletions

diff --git a/macosx/plugins/DFInput/Base.lproj/NetPcsxrHIDInputPluginMain.xib b/macosx/plugins/DFInput/Base.lproj/NetPcsxrHIDInputPluginMain.xib
index 9cd07551..3049937a 100644
--- a/macosx/plugins/DFInput/Base.lproj/NetPcsxrHIDInputPluginMain.xib
+++ b/macosx/plugins/DFInput/Base.lproj/NetPcsxrHIDInputPluginMain.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NetPcsxrHIDInputPluginPadController">
@@ -127,7 +127,7 @@ Gw
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="194">
-                    <rect key="frame" x="17" y="300" width="43" height="14"/>
+                    <rect key="frame" x="18" y="300" width="43" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Device:" id="208">
                         <font key="font" metaFont="smallSystem"/>
@@ -136,7 +136,7 @@ Gw
                     </textFieldCell>
                 </textField>
                 <popUpButton verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="189">
-                    <rect key="frame" x="62" y="295" width="195" height="22"/>
+                    <rect key="frame" x="64" y="295" width="195" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="189" id="4yb-mx-WCf"/>
@@ -155,7 +155,7 @@ Gw
                     </connections>
                 </popUpButton>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="185">
-                    <rect key="frame" x="60" y="8" width="302" height="14"/>
+                    <rect key="frame" x="62" y="10" width="299" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="To reset an entry: Select it and press the delete '←' key" id="206">
                         <font key="font" metaFont="smallSystem"/>
@@ -164,7 +164,7 @@ Gw
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="132">
-                    <rect key="frame" x="259" y="300" width="40" height="14"/>
+                    <rect key="frame" x="262" y="300" width="36" height="14"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Type:" id="205">
                         <font key="font" metaFont="smallSystem"/>
@@ -178,13 +178,17 @@ Gw
                     <constraints>
                         <constraint firstAttribute="width" constant="99" id="236"/>
                     </constraints>
-                    <popUpButtonCell key="cell" type="push" title="Digital Pad" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="130" id="204">
+                    <popUpButtonCell key="cell" type="push" title="Analog Pad" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="198" id="204">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
                         <menu key="menu" title="OtherViews" id="127">
                             <items>
-                                <menuItem title="Digital Pad" state="on" id="130"/>
-                                <menuItem title="Analog Pad" id="198"/>
+                                <menuItem title="Digital Pad" id="130">
+                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                </menuItem>
+                                <menuItem title="Analog Pad" state="on" id="198">
+                                    <modifierMask key="keyEquivalentModifierMask"/>
+                                </menuItem>
                             </items>
                         </menu>
                     </popUpButtonCell>
@@ -193,14 +197,14 @@ Gw
                     </connections>
                 </popUpButton>
                 <scrollView horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="121">
-                    <rect key="frame" x="20" y="30" width="383" height="260"/>
+                    <rect key="frame" x="20" y="32" width="383" height="258"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <clipView key="contentView" id="xit-lf-WfZ">
-                        <rect key="frame" x="1" y="17" width="381" height="242"/>
+                        <rect key="frame" x="1" y="17" width="366" height="240"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" tag="1" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="14" headerView="212" id="123">
-                                <rect key="frame" x="0.0" y="0.0" width="381" height="242"/>
+                                <rect key="frame" x="0.0" y="0.0" width="366" height="240"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -219,7 +223,7 @@ Gw
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </textFieldCell>
                                     </tableColumn>
-                                    <tableColumn identifier="button" width="254.96499633789062" minWidth="46.965000152587891" maxWidth="1000" id="124">
+                                    <tableColumn identifier="button" width="239.96499633789062" minWidth="46.965000152587891" maxWidth="1000" id="124">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Button">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -240,35 +244,35 @@ Gw
                         </subviews>
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
-                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" id="211">
+                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="211">
                         <rect key="frame" x="-100" y="-100" width="375" height="15"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <scroller key="verticalScroller" verticalHuggingPriority="750" id="210">
-                        <rect key="frame" x="366" y="17" width="16" height="242"/>
+                    <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="210">
+                        <rect key="frame" x="367" y="17" width="15" height="240"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="212">
-                        <rect key="frame" x="0.0" y="0.0" width="381" height="17"/>
+                        <rect key="frame" x="0.0" y="0.0" width="366" height="17"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
             <constraints>
                 <constraint firstItem="126" firstAttribute="leading" secondItem="132" secondAttribute="trailing" constant="8" symbolic="YES" id="238"/>
-                <constraint firstAttribute="trailing" secondItem="121" secondAttribute="trailing" constant="20" symbolic="YES" id="240"/>
-                <constraint firstItem="121" firstAttribute="leading" secondItem="16" secondAttribute="leading" constant="20" symbolic="YES" id="246"/>
-                <constraint firstAttribute="trailing" secondItem="126" secondAttribute="trailing" constant="20" symbolic="YES" id="247"/>
                 <constraint firstItem="132" firstAttribute="leading" secondItem="189" secondAttribute="trailing" constant="8" symbolic="YES" id="248"/>
                 <constraint firstItem="189" firstAttribute="leading" secondItem="194" secondAttribute="trailing" constant="8" symbolic="YES" id="277"/>
-                <constraint firstItem="185" firstAttribute="centerX" secondItem="121" secondAttribute="centerX" id="284"/>
-                <constraint firstAttribute="bottom" secondItem="185" secondAttribute="bottom" constant="8" id="290"/>
+                <constraint firstAttribute="bottom" secondItem="185" secondAttribute="bottom" constant="10" id="290"/>
                 <constraint firstItem="185" firstAttribute="top" secondItem="121" secondAttribute="bottom" constant="8" symbolic="YES" id="291"/>
                 <constraint firstItem="121" firstAttribute="top" secondItem="126" secondAttribute="bottom" constant="8" symbolic="YES" id="1x0-zI-e7A"/>
                 <constraint firstItem="132" firstAttribute="baseline" secondItem="194" secondAttribute="baseline" id="BCf-9Q-wD8"/>
+                <constraint firstItem="121" firstAttribute="trailing" secondItem="126" secondAttribute="trailing" id="Cpf-JP-y1U"/>
                 <constraint firstItem="132" firstAttribute="baseline" secondItem="126" secondAttribute="baseline" id="Gpf-Vs-HAL"/>
+                <constraint firstAttribute="centerX" secondItem="185" secondAttribute="centerX" id="H9E-Ql-g68"/>
+                <constraint firstAttribute="centerX" secondItem="121" secondAttribute="centerX" id="Mor-Zp-Kl1"/>
                 <constraint firstItem="189" firstAttribute="top" secondItem="16" secondAttribute="top" constant="20" symbolic="YES" id="kWH-eJ-7CV"/>
                 <constraint firstItem="194" firstAttribute="leading" secondItem="16" secondAttribute="leading" constant="20" symbolic="YES" id="nGT-PI-3rO"/>
+                <constraint firstItem="121" firstAttribute="leading" secondItem="194" secondAttribute="leading" id="o1F-SX-O9v"/>
                 <constraint firstItem="132" firstAttribute="baseline" secondItem="189" secondAttribute="baseline" id="sA6-sv-wIf"/>
             </constraints>
             <connections>