Skip to content

Commit 48d3db5

Browse files
lolgearlolgear
committed
kit: advanced commit view controller search field has been moved to bottom left corner.
1 parent 7e73609 commit 48d3db5

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎GitUpKit/Views/Base.lproj/GIAdvancedCommitViewController.xib‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<outlet property="indexFilesView" destination="SLl-qM-6U5" id="q90-XG-uOo"/>
1717
<outlet property="infoTextField" destination="H0U-9x-3Cl" id="xIS-An-utS"/>
1818
<outlet property="messageTextView" destination="ZGk-oR-MNP" id="bmf-B6-urc"/>
19-
<outlet property="searchTextField" destination="GC5-Ve-LR3" id="hLk-gX-Jw8"/>
19+
<outlet property="searchTextField" destination="u4y-Fx-A8g" id="hh4-Rf-0lw"/>
2020
<outlet property="stageButton" destination="nf2-5l-LHg" id="Y5g-wM-FRo"/>
2121
<outlet property="unstageButton" destination="0n6-Tx-H9g" id="RRF-VA-co7"/>
2222
<outlet property="view" destination="Mge-gB-T5T" id="Dk7-8C-xIa"/>
@@ -29,16 +29,8 @@
2929
<rect key="frame" x="0.0" y="0.0" width="1000" height="600"/>
3030
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3131
<subviews>
32-
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GC5-Ve-LR3">
33-
<rect key="frame" x="20" y="571" width="960" height="22"/>
34-
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="nac-La-dWj">
35-
<font key="font" metaFont="system"/>
36-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
37-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
38-
</searchFieldCell>
39-
</searchField>
4032
<splitView dividerStyle="thin" translatesAutoresizingMaskIntoConstraints="NO" id="ZbB-IP-Zuo" customClass="GIDualSplitView">
41-
<rect key="frame" x="0.0" y="0.0" width="1000" height="563"/>
33+
<rect key="frame" x="0.0" y="0.0" width="1000" height="600"/>
4234
<subviews>
4335
<customView fixedFrame="YES" id="KtH-4j-g0D">
4436
<rect key="frame" x="0.0" y="0.0" width="1000" height="452"/>
@@ -140,9 +132,18 @@
140132
</userDefinedRuntimeAttributes>
141133
</customView>
142134
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SLl-qM-6U5">
143-
<rect key="frame" x="0.0" y="0.0" width="300" height="168"/>
135+
<rect key="frame" x="0.0" y="30" width="300" height="138"/>
144136
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
145137
</customView>
138+
<searchField wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u4y-Fx-A8g">
139+
<rect key="frame" x="0.0" y="0.0" width="300" height="22"/>
140+
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
141+
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="kvx-Du-Akt">
142+
<font key="font" metaFont="system"/>
143+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
144+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
145+
</searchFieldCell>
146+
</searchField>
146147
</subviews>
147148
</customView>
148149
</subviews>
@@ -188,28 +189,28 @@
188189
</subviews>
189190
</customView>
190191
<customView fixedFrame="YES" id="yf9-6S-SRZ">
191-
<rect key="frame" x="0.0" y="453" width="1000" height="110"/>
192+
<rect key="frame" x="0.0" y="453" width="1000" height="147"/>
192193
<autoresizingMask key="autoresizingMask"/>
193194
<subviews>
194195
<scrollView focusRingType="exterior" fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JJQ-Rg-cUm">
195-
<rect key="frame" x="14" y="45" width="972" height="53"/>
196+
<rect key="frame" x="14" y="45" width="972" height="90"/>
196197
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
197198
<clipView key="contentView" drawsBackground="NO" id="MSi-0x-dun">
198-
<rect key="frame" x="1" y="1" width="970" height="51"/>
199+
<rect key="frame" x="1" y="1" width="970" height="88"/>
199200
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
200201
<subviews>
201202
<textView importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" smartInsertDelete="YES" id="ZGk-oR-MNP" customClass="GICommitMessageView">
202-
<rect key="frame" x="0.0" y="40" width="970" height="51"/>
203+
<rect key="frame" x="0.0" y="40" width="970" height="88"/>
203204
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
204205
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
205206
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
206-
<size key="minSize" width="970" height="51"/>
207+
<size key="minSize" width="970" height="88"/>
207208
<size key="maxSize" width="10000000" height="10000000"/>
208209
<attributedString key="textStorage">
209210
<fragment content="&lt;MESSAGE&gt;">
210211
<attributes>
211212
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
212-
<font key="NSFont" metaFont="menu" size="11"/>
213+
<font key="NSFont" metaFont="label" size="11"/>
213214
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
214215
</attributes>
215216
</fragment>
@@ -261,7 +262,7 @@ DQ
261262
<rect key="frame" x="130" y="16" width="614" height="14"/>
262263
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
263264
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="&lt;INFO&gt;" id="dbO-mu-br6">
264-
<font key="font" metaFont="menu" size="11"/>
265+
<font key="font" metaFont="label" size="11"/>
265266
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
266267
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
267268
</textFieldCell>
@@ -296,11 +297,8 @@ DQ
296297
</splitView>
297298
</subviews>
298299
<constraints>
299-
<constraint firstItem="ZbB-IP-Zuo" firstAttribute="top" secondItem="GC5-Ve-LR3" secondAttribute="bottom" constant="8" id="604-ku-3O5"/>
300-
<constraint firstAttribute="trailing" secondItem="GC5-Ve-LR3" secondAttribute="trailing" constant="20" id="GQi-qD-9cf"/>
301-
<constraint firstItem="GC5-Ve-LR3" firstAttribute="top" secondItem="Mge-gB-T5T" secondAttribute="top" constant="7" id="SWp-5S-htc"/>
302300
<constraint firstAttribute="trailing" secondItem="ZbB-IP-Zuo" secondAttribute="trailing" id="bvA-cc-q9Z"/>
303-
<constraint firstItem="GC5-Ve-LR3" firstAttribute="leading" secondItem="Mge-gB-T5T" secondAttribute="leading" constant="20" id="huO-2k-NI8"/>
301+
<constraint firstItem="ZbB-IP-Zuo" firstAttribute="top" secondItem="Mge-gB-T5T" secondAttribute="top" id="l4T-HJ-7Zh"/>
304302
<constraint firstItem="ZbB-IP-Zuo" firstAttribute="leading" secondItem="Mge-gB-T5T" secondAttribute="leading" id="nrQ-AF-6xQ"/>
305303
<constraint firstAttribute="bottom" secondItem="ZbB-IP-Zuo" secondAttribute="bottom" id="qkx-Cf-05M"/>
306304
</constraints>

‎GitUpKit/Views/GIAdvancedCommitViewController.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ @implementation GIAdvancedCommitViewController {
5151
#pragma mark - Search
5252
- (void)setupSearch {
5353
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(textDidChange:) name:NSTextDidChangeNotification object:nil];
54+
self.searchTextField.nextKeyView = self.messageTextView;
55+
self.searchTextField.nextResponder = self.messageTextView;
5456
}
5557

5658
- (void)resetSearch {

0 commit comments

Comments
 (0)