Skip to content

Commit 74709bf

Browse files
committed
Resolve some ambiguous constraints and improve default sizing window and advanced commit view.
1 parent 2e228aa commit 74709bf

2 files changed

Lines changed: 44 additions & 40 deletions

File tree

GitUp/Application/Base.lproj/Document.xib

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@
6161
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
6262
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
6363
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
64-
<rect key="contentRect" x="253" y="204" width="800" height="561"/>
65-
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1410"/>
64+
<rect key="contentRect" x="253" y="204" width="800" height="550"/>
65+
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1084"/>
6666
<value key="minSize" type="size" width="800" height="490"/>
6767
<view key="contentView" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gIp-Ho-8D9">
68-
<rect key="frame" x="0.0" y="0.0" width="800" height="561"/>
68+
<rect key="frame" x="0.0" y="0.0" width="800" height="754"/>
6969
<subviews>
70-
<customView hidden="YES" appearanceType="aqua" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zjf-1c-7Wk" customClass="GIColorView">
71-
<rect key="frame" x="0.0" y="407" width="612" height="50"/>
70+
<customView hidden="YES" appearanceType="aqua" translatesAutoresizingMaskIntoConstraints="NO" id="Zjf-1c-7Wk" customClass="GIColorView">
71+
<rect key="frame" x="0.0" y="600" width="800" height="50"/>
7272
<subviews>
7373
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hTO-MR-3XZ">
7474
<rect key="frame" x="8" y="8" width="818" height="31"/>
@@ -80,7 +80,7 @@
8080
</textFieldCell>
8181
</textField>
8282
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="W0y-nq-maS">
83-
<rect key="frame" x="522" y="16" width="80" height="17"/>
83+
<rect key="frame" x="710" y="16" width="80" height="17"/>
8484
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
8585
<buttonCell key="cell" type="roundRect" title="Continue" bezelStyle="roundedRect" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3Bn-bb-IAI">
8686
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -91,7 +91,7 @@
9191
</connections>
9292
</button>
9393
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="etB-ce-0PB">
94-
<rect key="frame" x="444" y="16" width="60" height="17"/>
94+
<rect key="frame" x="632" y="16" width="60" height="17"/>
9595
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
9696
<buttonCell key="cell" type="roundRect" title="Got It!" bezelStyle="roundedRect" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="U4W-Zh-R2B">
9797
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -102,7 +102,7 @@
102102
</connections>
103103
</button>
104104
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cA6-Ht-e3Z">
105-
<rect key="frame" x="512" y="16" width="90" height="17"/>
105+
<rect key="frame" x="700" y="16" width="90" height="17"/>
106106
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
107107
<buttonCell key="cell" type="roundRect" title="Learn More…" bezelStyle="roundedRect" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ux0-pi-0du">
108108
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -122,13 +122,17 @@
122122
</userDefinedRuntimeAttribute>
123123
</userDefinedRuntimeAttributes>
124124
</customView>
125-
<tabView ambiguous="YES" drawsBackground="NO" allowsTruncatedLabels="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="8LX-i4-RBG">
126-
<rect key="frame" x="0.0" y="196" width="612" height="365"/>
125+
<tabView drawsBackground="NO" allowsTruncatedLabels="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="8LX-i4-RBG">
126+
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
127+
<constraints>
128+
<constraint firstAttribute="width" priority="250" constant="800" id="7gD-o5-c9F"/>
129+
<constraint firstAttribute="height" priority="250" constant="600" id="vve-j1-woa"/>
130+
</constraints>
127131
<font key="font" metaFont="system"/>
128132
<tabViewItems>
129133
<tabViewItem label="Map" identifier="map" id="N3S-ZN-7aj">
130-
<view key="view" ambiguous="YES" id="KTA-UW-CKM">
131-
<rect key="frame" x="0.0" y="0.0" width="612" height="365"/>
134+
<view key="view" id="KTA-UW-CKM">
135+
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
132136
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
133137
</view>
134138
</tabViewItem>
@@ -746,7 +750,7 @@ Adjust settings in Show menu</string>
746750
<windowStyleMask key="styleMask" titled="YES"/>
747751
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
748752
<rect key="contentRect" x="131" y="158" width="450" height="173"/>
749-
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1410"/>
753+
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1084"/>
750754
<view key="contentView" id="l4r-5b-f0f">
751755
<rect key="frame" x="0.0" y="0.0" width="450" height="173"/>
752756
<autoresizingMask key="autoresizingMask"/>

0 commit comments

Comments
 (0)