Skip to content

Commit 7c85f3b

Browse files
andrew-codechimpandrew-codechimp
committed
Improve layout constraints
1 parent bb6840f commit 7c85f3b

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

‎HA Menu/Base.lproj/Main.storyboard

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -710,31 +710,23 @@
710710
<autoresizingMask key="autoresizingMask"/>
711711
<subviews>
712712
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d6B-OZ-GYv">
713-
<rect key="frame" x="18" y="423" width="44" height="16"/>
713+
<rect key="frame" x="18" y="426" width="44" height="16"/>
714714
<textFieldCell key="cell" lineBreakMode="clipping" title="Server" id="lrv-Ft-Gue">
715715
<font key="font" metaFont="system"/>
716716
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
717717
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
718718
</textFieldCell>
719719
</textField>
720720
<textField verticalHuggingPriority="750" ambiguous="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cJg-XY-9A6" userLabel="Server">
721-
<rect key="frame" x="80" y="422" width="325" height="20"/>
721+
<rect key="frame" x="80" y="425" width="325" height="20"/>
722722
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="border" placeholderString="http://your.server:8123" drawsBackground="YES" id="9z1-au-9a6">
723723
<font key="font" metaFont="system"/>
724724
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
725725
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
726726
</textFieldCell>
727727
</textField>
728-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="s4S-Br-111">
729-
<rect key="frame" x="18" y="393" width="41" height="16"/>
730-
<textFieldCell key="cell" lineBreakMode="clipping" title="Token" id="bQV-gm-Oxx">
731-
<font key="font" metaFont="system"/>
732-
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
733-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
734-
</textFieldCell>
735-
</textField>
736728
<textField verticalHuggingPriority="750" ambiguous="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xLm-S0-5hb" userLabel="Token">
737-
<rect key="frame" x="80" y="312" width="325" height="100"/>
729+
<rect key="frame" x="80" y="306" width="325" height="100"/>
738730
<constraints>
739731
<constraint firstAttribute="height" constant="100" id="Eue-mA-oog"/>
740732
</constraints>
@@ -745,21 +737,21 @@
745737
</textFieldCell>
746738
</textField>
747739
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="axF-OX-WUt">
748-
<rect key="frame" x="18" y="10" width="101" height="18"/>
740+
<rect key="frame" x="18" y="10" width="389" height="18"/>
749741
<buttonCell key="cell" type="check" title="Start at login" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QMM-8Q-kj2">
750742
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
751743
<font key="font" metaFont="system"/>
752744
</buttonCell>
753745
</button>
754746
<scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="sDh-nR-2un">
755-
<rect key="frame" x="20" y="78" width="385" height="192"/>
747+
<rect key="frame" x="20" y="60" width="385" height="210"/>
756748
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
757749
<clipView key="contentView" id="OZ8-JA-aYe">
758-
<rect key="frame" x="1" y="0.0" width="383" height="191"/>
750+
<rect key="frame" x="1" y="0.0" width="383" height="209"/>
759751
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
760752
<subviews>
761753
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="AbX-ym-xml" id="Gml-eL-0ch">
762-
<rect key="frame" x="0.0" y="0.0" width="383" height="166"/>
754+
<rect key="frame" x="0.0" y="0.0" width="383" height="184"/>
763755
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
764756
<size key="intercellSpacing" width="3" height="2"/>
765757
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -817,9 +809,9 @@
817809
</tableHeaderView>
818810
</scrollView>
819811
<button verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bzu-iR-vUe">
820-
<rect key="frame" x="299" y="274" width="112" height="32"/>
812+
<rect key="frame" x="299" y="268" width="112" height="32"/>
821813
<constraints>
822-
<constraint firstAttribute="width" constant="100" id="wVt-oi-xmo"/>
814+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="wVt-oi-xmo"/>
823815
</constraints>
824816
<buttonCell key="cell" type="push" title="Connect" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="bZm-aG-Ral">
825817
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -830,43 +822,56 @@
830822
</connections>
831823
</button>
832824
<textField identifier="LabelStatus" horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0wc-Hy-MC4">
833-
<rect key="frame" x="18" y="279" width="281" height="21"/>
825+
<rect key="frame" x="18" y="278" width="23" height="16"/>
834826
<textFieldCell key="cell" lineBreakMode="clipping" title="OK" id="2fl-Mt-VYj">
835827
<font key="font" metaFont="system"/>
836828
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
837829
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
838830
</textFieldCell>
839831
</textField>
840832
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Sv8-cb-OH4">
841-
<rect key="frame" x="18" y="36" width="212" height="18"/>
833+
<rect key="frame" x="18" y="36" width="389" height="18"/>
842834
<buttonCell key="cell" type="check" title="Show beta version notifications" bezelStyle="regularSquare" imagePosition="left" inset="2" id="MrG-7X-nxL">
843835
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
844836
<font key="font" metaFont="system"/>
845837
</buttonCell>
846838
</button>
839+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="s4S-Br-111">
840+
<rect key="frame" x="18" y="387" width="44" height="16"/>
841+
<textFieldCell key="cell" lineBreakMode="clipping" title="Token" id="bQV-gm-Oxx">
842+
<font key="font" metaFont="system"/>
843+
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
844+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
845+
</textFieldCell>
846+
</textField>
847847
</subviews>
848848
<constraints>
849849
<constraint firstItem="s4S-Br-111" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="20" id="34T-zI-vwb"/>
850+
<constraint firstAttribute="trailing" secondItem="axF-OX-WUt" secondAttribute="trailing" constant="20" id="3O8-lx-vmR"/>
850851
<constraint firstItem="bzu-iR-vUe" firstAttribute="top" secondItem="xLm-S0-5hb" secondAttribute="bottom" constant="10" id="5ZP-mQ-ac7"/>
852+
<constraint firstItem="s4S-Br-111" firstAttribute="top" secondItem="d6B-OZ-GYv" secondAttribute="bottom" constant="23" id="8cM-j8-VqT"/>
851853
<constraint firstItem="Sv8-cb-OH4" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="20" id="99K-h2-pYk"/>
852854
<constraint firstItem="cJg-XY-9A6" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="80" id="9Vl-lw-U6K"/>
853-
<constraint firstItem="bzu-iR-vUe" firstAttribute="leading" secondItem="0wc-Hy-MC4" secondAttribute="trailing" constant="8" id="BTp-MV-OS7"/>
854-
<constraint firstItem="cJg-XY-9A6" firstAttribute="top" secondItem="R2d-cY-rAO" secondAttribute="top" constant="20" id="EES-ro-OxP"/>
855855
<constraint firstItem="d6B-OZ-GYv" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="20" id="EnX-3J-8D4"/>
856856
<constraint firstItem="0wc-Hy-MC4" firstAttribute="top" secondItem="xLm-S0-5hb" secondAttribute="bottom" constant="12" id="Gnz-5Q-1vQ"/>
857+
<constraint firstItem="xLm-S0-5hb" firstAttribute="top" secondItem="cJg-XY-9A6" secondAttribute="bottom" constant="20" id="HQV-Gu-Q6q"/>
857858
<constraint firstAttribute="bottom" secondItem="axF-OX-WUt" secondAttribute="bottom" constant="12" id="M7I-If-u2Y"/>
858859
<constraint firstAttribute="trailing" secondItem="bzu-iR-vUe" secondAttribute="trailing" constant="20" id="NXM-lC-QuH"/>
859860
<constraint firstAttribute="trailing" secondItem="sDh-nR-2un" secondAttribute="trailing" constant="20" id="THJ-V9-Tc1"/>
860861
<constraint firstAttribute="trailing" secondItem="cJg-XY-9A6" secondAttribute="trailing" constant="20" id="W42-Qg-lQY"/>
861862
<constraint firstAttribute="trailing" secondItem="xLm-S0-5hb" secondAttribute="trailing" constant="20" id="WAD-wr-kZD"/>
862-
<constraint firstItem="xLm-S0-5hb" firstAttribute="top" secondItem="cJg-XY-9A6" secondAttribute="bottom" constant="10" id="ZjP-kP-04q"/>
863+
<constraint firstAttribute="trailing" secondItem="Sv8-cb-OH4" secondAttribute="trailing" constant="20" id="Wjc-IB-aRo"/>
863864
<constraint firstItem="d6B-OZ-GYv" firstAttribute="firstBaseline" secondItem="cJg-XY-9A6" secondAttribute="firstBaseline" id="a0P-rV-MdY"/>
865+
<constraint firstItem="Sv8-cb-OH4" firstAttribute="top" secondItem="sDh-nR-2un" secondAttribute="bottom" constant="8" id="ikt-f8-guF"/>
866+
<constraint firstItem="cJg-XY-9A6" firstAttribute="leading" secondItem="d6B-OZ-GYv" secondAttribute="trailing" constant="20" id="juI-gq-CI6"/>
867+
<constraint firstItem="d6B-OZ-GYv" firstAttribute="top" secondItem="R2d-cY-rAO" secondAttribute="top" constant="20" id="lSH-AZ-EQh"/>
864868
<constraint firstItem="xLm-S0-5hb" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="80" id="mlv-fV-Os6"/>
869+
<constraint firstItem="bzu-iR-vUe" firstAttribute="leading" relation="lessThanOrEqual" secondItem="0wc-Hy-MC4" secondAttribute="trailing" constant="266" id="sAR-SO-Ewq"/>
865870
<constraint firstItem="0wc-Hy-MC4" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="20" id="uVa-bO-Oih"/>
866871
<constraint firstItem="axF-OX-WUt" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="20" id="vND-ld-nML"/>
867872
<constraint firstItem="sDh-nR-2un" firstAttribute="top" secondItem="0wc-Hy-MC4" secondAttribute="bottom" constant="8" id="vSB-sd-Kmy"/>
868873
<constraint firstItem="sDh-nR-2un" firstAttribute="leading" secondItem="R2d-cY-rAO" secondAttribute="leading" constant="20" id="wtY-zJ-ja6"/>
869-
<constraint firstItem="s4S-Br-111" firstAttribute="top" secondItem="R2d-cY-rAO" secondAttribute="top" constant="53" id="y5H-Ch-p7Y"/>
874+
<constraint firstItem="xLm-S0-5hb" firstAttribute="leading" secondItem="s4S-Br-111" secondAttribute="trailing" constant="20" id="yK2-em-TO2"/>
870875
<constraint firstItem="axF-OX-WUt" firstAttribute="top" secondItem="Sv8-cb-OH4" secondAttribute="bottom" constant="12" id="zn9-EB-0UR"/>
871876
</constraints>
872877
</view>

0 commit comments

Comments
 (0)