Skip to content

Commit 2e228aa

Browse files
lucasderraughlucasderraugh
committed
Fixup constraints for snapshots view and fix initial constraint on help view
1 parent 24a4475 commit 2e228aa

4 files changed

Lines changed: 29 additions & 24 deletions

File tree

‎GitUp/Application/Base.lproj/Document.xib‎

Lines changed: 8 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="612" height="365"/>
64+
<rect key="contentRect" x="253" y="204" width="800" height="561"/>
6565
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1410"/>
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="612" height="365"/>
68+
<rect key="frame" x="0.0" y="0.0" width="800" height="561"/>
6969
<subviews>
7070
<customView hidden="YES" appearanceType="aqua" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zjf-1c-7Wk" customClass="GIColorView">
71-
<rect key="frame" x="0.0" y="211" width="612" height="50"/>
71+
<rect key="frame" x="0.0" y="407" width="612" 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"/>
@@ -123,7 +123,7 @@
123123
</userDefinedRuntimeAttributes>
124124
</customView>
125125
<tabView ambiguous="YES" drawsBackground="NO" allowsTruncatedLabels="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="8LX-i4-RBG">
126-
<rect key="frame" x="0.0" y="0.0" width="612" height="365"/>
126+
<rect key="frame" x="0.0" y="196" width="612" height="365"/>
127127
<font key="font" metaFont="system"/>
128128
<tabViewItems>
129129
<tabViewItem label="Map" identifier="map" id="N3S-ZN-7aj">
@@ -294,7 +294,7 @@
294294
<outlet property="delegate" destination="-2" id="YNn-Pj-uPM"/>
295295
</connections>
296296
</toolbar>
297-
<point key="canvasLocation" x="-113" y="-62"/>
297+
<point key="canvasLocation" x="289" y="167.5"/>
298298
</window>
299299
<customView id="p3q-Tt-mR8" userLabel="Map View">
300300
<rect key="frame" x="0.0" y="0.0" width="1000" height="518"/>
@@ -628,11 +628,9 @@ Adjust settings in Show menu</string>
628628
<rect key="frame" x="0.0" y="0.0" width="261" height="500"/>
629629
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
630630
<subviews>
631-
<customView translatesAutoresizingMaskIntoConstraints="NO" id="8Xd-B3-3KB">
631+
<customView id="8Xd-B3-3KB">
632632
<rect key="frame" x="1" y="41" width="260" height="459"/>
633-
<constraints>
634-
<constraint firstAttribute="width" constant="260" id="HV6-eG-eeh"/>
635-
</constraints>
633+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
636634
</customView>
637635
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rOD-bh-eJs">
638636
<rect key="frame" x="87" y="8" width="88" height="24"/>
@@ -656,16 +654,13 @@ Adjust settings in Show menu</string>
656654
</subviews>
657655
<constraints>
658656
<constraint firstItem="BaD-c2-XFv" firstAttribute="top" secondItem="pJT-Vs-rsm" secondAttribute="top" id="9Z0-jG-S1Y"/>
659-
<constraint firstItem="8Xd-B3-3KB" firstAttribute="leading" secondItem="BaD-c2-XFv" secondAttribute="trailing" id="DKb-fF-pZH"/>
660657
<constraint firstAttribute="bottom" secondItem="rOD-bh-eJs" secondAttribute="bottom" constant="8" id="Kef-A5-dmC"/>
661658
<constraint firstAttribute="trailing" secondItem="Usm-DE-GWR" secondAttribute="trailing" id="Nr7-rh-mHc"/>
662659
<constraint firstAttribute="bottom" secondItem="BaD-c2-XFv" secondAttribute="bottom" id="OKP-CZ-VT6"/>
660+
<constraint firstItem="BaD-c2-XFv" firstAttribute="leading" secondItem="pJT-Vs-rsm" secondAttribute="leading" id="Stt-SV-dVv"/>
663661
<constraint firstItem="rOD-bh-eJs" firstAttribute="centerX" secondItem="pJT-Vs-rsm" secondAttribute="centerX" id="cQi-wF-BIq"/>
664-
<constraint firstItem="8Xd-B3-3KB" firstAttribute="top" secondItem="pJT-Vs-rsm" secondAttribute="top" id="dbY-vm-VV3"/>
665662
<constraint firstItem="rOD-bh-eJs" firstAttribute="top" secondItem="Usm-DE-GWR" secondAttribute="bottom" constant="8" id="eYx-Rn-O7K"/>
666663
<constraint firstItem="Usm-DE-GWR" firstAttribute="leading" secondItem="pJT-Vs-rsm" secondAttribute="leading" constant="1" id="f13-aO-zM1"/>
667-
<constraint firstAttribute="trailing" secondItem="8Xd-B3-3KB" secondAttribute="trailing" id="hBn-cA-XXH"/>
668-
<constraint firstItem="Usm-DE-GWR" firstAttribute="top" secondItem="8Xd-B3-3KB" secondAttribute="bottom" id="yaf-NF-Avr"/>
669664
</constraints>
670665
<point key="canvasLocation" x="-526" y="650"/>
671666
</customView>

‎GitUp/Application/Document.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ - (void)windowControllerDidLoadNib:(NSWindowController*)windowController {
300300
searchFieldPreferredWidth.priority = NSLayoutPriorityDefaultHigh - 20;
301301
NSLayoutConstraint* searchFieldMaxWidth = [_searchItem.searchField.widthAnchor constraintLessThanOrEqualToConstant:kSearchFieldExpandedWidth];
302302
[NSLayoutConstraint activateConstraints:@[ searchFieldPreferredWidth, searchFieldMaxWidth ]];
303+
304+
_helpViewToTabViewConstraint.active = NO;
303305

304306
_mapViewController = [[GIMapViewController alloc] initWithRepository:_repository];
305307
_mapViewController.delegate = self;

‎GitUpKit/Components/Base.lproj/GICommitListViewController.xib‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
<rect key="frame" x="0.0" y="0.0" width="310" height="494"/>
2020
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2121
<subviews>
22-
<scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="71" horizontalPageScroll="10" verticalLineScroll="71" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="AJL-NY-aX0">
22+
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="71" horizontalPageScroll="10" verticalLineScroll="71" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="AJL-NY-aX0">
2323
<rect key="frame" x="0.0" y="0.0" width="310" height="494"/>
24-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2524
<clipView key="contentView" id="rt3-aj-SED">
2625
<rect key="frame" x="0.0" y="0.0" width="310" height="494"/>
2726
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -49,31 +48,31 @@
4948
<rect key="frame" x="0.0" y="0.0" width="310" height="68"/>
5049
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
5150
<subviews>
52-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aSE-41-Faa">
51+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aSE-41-Faa">
5352
<rect key="frame" x="6" y="49" width="46" height="14"/>
5453
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;SHA1&gt;" id="vGZ-yd-Q3L">
5554
<font key="font" metaFont="smallSystem"/>
5655
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
5756
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
5857
</textFieldCell>
5958
</textField>
60-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l20-Zd-aeU">
59+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="l20-Zd-aeU">
6160
<rect key="frame" x="258" y="49" width="46" height="14"/>
6261
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" title="&lt;DATE&gt;" id="fnB-nM-Xez">
6362
<font key="font" metaFont="smallSystem"/>
6463
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
6564
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
6665
</textFieldCell>
6766
</textField>
68-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T2M-SH-2iE">
67+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T2M-SH-2iE">
6968
<rect key="frame" x="6" y="27" width="294" height="14"/>
7069
<textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;SUMMARY&gt;" id="ldy-6V-89y">
7170
<font key="font" metaFont="smallSystem"/>
7271
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
7372
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
7473
</textFieldCell>
7574
</textField>
76-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="hoX-uL-0Vn">
75+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="hoX-uL-0Vn">
7776
<rect key="frame" x="6" y="5" width="298" height="14"/>
7877
<textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;AUTHOR&gt;" id="Wfd-kf-H2a">
7978
<font key="font" metaFont="smallSystem"/>
@@ -107,15 +106,15 @@
107106
<rect key="frame" x="0.0" y="68" width="310" height="46"/>
108107
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
109108
<subviews>
110-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="n3I-nl-DwW">
109+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="n3I-nl-DwW">
111110
<rect key="frame" x="6" y="27" width="298" height="14"/>
112111
<textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;TYPE&gt;" id="opM-4b-OCF">
113112
<font key="font" metaFont="smallSystem"/>
114113
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
115114
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
116115
</textFieldCell>
117116
</textField>
118-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="mTb-0f-1hd">
117+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="mTb-0f-1hd">
119118
<rect key="frame" x="6" y="5" width="298" height="14"/>
120119
<textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;NAME&gt;" id="HEY-qh-9fe">
121120
<font key="font" metaFont="smallSystem"/>
@@ -158,7 +157,7 @@
158157
<autoresizingMask key="autoresizingMask"/>
159158
</scroller>
160159
</scrollView>
161-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2ZB-wM-XaF">
160+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2ZB-wM-XaF">
162161
<rect key="frame" x="119" y="239" width="73" height="17"/>
163162
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="&lt;EMPTY&gt;" id="t3C-dG-D6U">
164163
<font key="font" metaFont="system" size="14"/>
@@ -168,8 +167,12 @@
168167
</textField>
169168
</subviews>
170169
<constraints>
170+
<constraint firstAttribute="bottom" secondItem="AJL-NY-aX0" secondAttribute="bottom" id="I6B-iU-joi"/>
171171
<constraint firstItem="2ZB-wM-XaF" firstAttribute="centerY" secondItem="Mge-gB-T5T" secondAttribute="centerY" id="Kd4-iF-O86"/>
172172
<constraint firstItem="2ZB-wM-XaF" firstAttribute="centerX" secondItem="Mge-gB-T5T" secondAttribute="centerX" id="Xf7-IF-FAo"/>
173+
<constraint firstAttribute="trailing" secondItem="AJL-NY-aX0" secondAttribute="trailing" id="jOW-2A-7cQ"/>
174+
<constraint firstItem="AJL-NY-aX0" firstAttribute="top" secondItem="Mge-gB-T5T" secondAttribute="top" id="k6d-vn-sif"/>
175+
<constraint firstItem="AJL-NY-aX0" firstAttribute="leading" secondItem="Mge-gB-T5T" secondAttribute="leading" id="qMQ-oO-afy"/>
173176
</constraints>
174177
<point key="canvasLocation" x="40" y="536"/>
175178
</view>

‎GitUpKit/Components/Base.lproj/GISnapshotListViewController.xib‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
<rect key="frame" x="0.0" y="0.0" width="310" height="500"/>
1919
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2020
<subviews>
21-
<scrollView fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="67" horizontalPageScroll="10" verticalLineScroll="67" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="AJL-NY-aX0">
21+
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="67" horizontalPageScroll="10" verticalLineScroll="67" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="AJL-NY-aX0">
2222
<rect key="frame" x="0.0" y="0.0" width="310" height="500"/>
23-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2423
<clipView key="contentView" id="rt3-aj-SED">
2524
<rect key="frame" x="0.0" y="0.0" width="310" height="500"/>
2625
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -144,6 +143,12 @@
144143
</scroller>
145144
</scrollView>
146145
</subviews>
146+
<constraints>
147+
<constraint firstItem="AJL-NY-aX0" firstAttribute="leading" secondItem="Mge-gB-T5T" secondAttribute="leading" id="28t-5C-WgL"/>
148+
<constraint firstAttribute="trailing" secondItem="AJL-NY-aX0" secondAttribute="trailing" id="Y4j-om-Xln"/>
149+
<constraint firstItem="AJL-NY-aX0" firstAttribute="top" secondItem="Mge-gB-T5T" secondAttribute="top" id="uI5-T2-fNs"/>
150+
<constraint firstAttribute="bottom" secondItem="AJL-NY-aX0" secondAttribute="bottom" id="uxQ-8B-RE3"/>
151+
</constraints>
147152
<point key="canvasLocation" x="40" y="536"/>
148153
</view>
149154
</objects>

0 commit comments

Comments
 (0)