Skip to content

Commit 813ea9d

Browse files
bentemplebentemple
authored
Swapped Diff Splitter "Old Commit" and "New Commit" panel order (#643)
The "Old Commit" when visualized in gitup will be the bottom commit, so it makes sense intuitively that by having it in the bottom-left corner of the split window, and the "New Commit" in the top-left corner of the window, when I drag changes from the old commit to the new commit, I'm dragging changes from the original commit into a new commit that will be on-top of the original commit. Fixes #642 Test-Plan - Launched gitup from within the xCode project. - Verified that when splitting a commit the old commit was in the bottom left hand corner and dragging files into the new commit panel on the top-left corner of the screen worked as expected. - Verified that when rewriting the messages of the commits, the new commit message was on top and the old commit message was on the bottom of the opened dialog matching the order of the primary split commit view. - Split a commit with gitup successfully. - Verified that the new commit was above the old commit in the tree as expected and that both the new and old messages were correct.
1 parent 7e19f2c commit 813ea9d

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

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

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<rect key="frame" x="127" y="8" width="855" height="16"/>
4747
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
4848
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;TITLE&gt;" id="2Ta-mo-RyA">
49-
<font key="font" metaFont="controlContent"/>
49+
<font key="font" metaFont="cellTitle"/>
5050
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
5151
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
5252
</textFieldCell>
@@ -69,18 +69,18 @@
6969
<rect key="frame" x="0.0" y="46" width="300" height="424"/>
7070
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7171
<subviews>
72-
<customView id="VtZ-UX-sFq">
73-
<rect key="frame" x="0.0" y="0.0" width="300" height="212"/>
72+
<customView id="ots-w9-o6k">
73+
<rect key="frame" x="0.0" y="0.0" width="300" height="211"/>
7474
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7575
<subviews>
76-
<customView id="7j5-Pz-Pse" customClass="GIColorView">
77-
<rect key="frame" x="0.0" y="178" width="300" height="34"/>
76+
<customView id="i0X-9n-k1u" customClass="GIColorView">
77+
<rect key="frame" x="0.0" y="177" width="300" height="34"/>
7878
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
7979
<subviews>
80-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="JBE-2n-Fmz">
80+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Zg3-mt-YHc">
8181
<rect key="frame" x="8" y="9" width="154" height="17"/>
8282
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
83-
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Old Commit" id="CSN-Cf-azv">
83+
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="New Commit" id="C06-wj-5uc">
8484
<font key="font" metaFont="systemBold"/>
8585
<color key="textColor" name="alternateSelectedControlTextColor" catalog="System" colorSpace="catalog"/>
8686
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -93,24 +93,24 @@
9393
</userDefinedRuntimeAttribute>
9494
</userDefinedRuntimeAttributes>
9595
</customView>
96-
<customView id="Scn-lW-rL0">
97-
<rect key="frame" x="0.0" y="0.0" width="300" height="178"/>
96+
<customView id="IfV-FZ-t0W">
97+
<rect key="frame" x="0.0" y="0.0" width="300" height="177"/>
9898
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
9999
</customView>
100100
</subviews>
101101
</customView>
102-
<customView id="ots-w9-o6k">
103-
<rect key="frame" x="0.0" y="213" width="300" height="211"/>
102+
<customView id="VtZ-UX-sFq">
103+
<rect key="frame" x="0.0" y="212" width="300" height="212"/>
104104
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
105105
<subviews>
106-
<customView id="i0X-9n-k1u" customClass="GIColorView">
107-
<rect key="frame" x="0.0" y="177" width="300" height="34"/>
106+
<customView id="7j5-Pz-Pse" customClass="GIColorView">
107+
<rect key="frame" x="0.0" y="178" width="300" height="34"/>
108108
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
109109
<subviews>
110-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Zg3-mt-YHc">
110+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="JBE-2n-Fmz">
111111
<rect key="frame" x="8" y="9" width="154" height="17"/>
112112
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
113-
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="New Commit" id="C06-wj-5uc">
113+
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Old Commit" id="CSN-Cf-azv">
114114
<font key="font" metaFont="systemBold"/>
115115
<color key="textColor" name="alternateSelectedControlTextColor" catalog="System" colorSpace="catalog"/>
116116
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -123,8 +123,8 @@
123123
</userDefinedRuntimeAttribute>
124124
</userDefinedRuntimeAttributes>
125125
</customView>
126-
<customView id="IfV-FZ-t0W">
127-
<rect key="frame" x="0.0" y="0.0" width="300" height="177"/>
126+
<customView id="Scn-lW-rL0">
127+
<rect key="frame" x="0.0" y="0.0" width="300" height="178"/>
128128
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
129129
</customView>
130130
</subviews>
@@ -207,29 +207,29 @@ DQ
207207
<rect key="frame" x="0.0" y="0.0" width="590" height="354"/>
208208
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
209209
<subviews>
210-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="VJr-bi-EjL">
210+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Mi2-Di-27H">
211211
<rect key="frame" x="18" y="322" width="183" height="17"/>
212212
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
213-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Old commit message:" id="3xC-Vl-BIN">
213+
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="New commit message:" id="Rs6-wQ-uAF">
214214
<font key="font" metaFont="system"/>
215215
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
216216
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
217217
</textFieldCell>
218218
</textField>
219-
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="sdt-ps-l95">
219+
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="FGz-GT-MFK">
220220
<rect key="frame" x="20" y="214" width="550" height="100"/>
221221
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
222-
<clipView key="contentView" drawsBackground="NO" id="sKA-Dg-4u7">
222+
<clipView key="contentView" drawsBackground="NO" id="iv1-rd-iqv">
223223
<rect key="frame" x="1" y="1" width="548" height="98"/>
224224
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
225225
<subviews>
226-
<textView importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" smartInsertDelete="YES" id="C9q-53-7wr" customClass="GICommitMessageView">
226+
<textView importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" smartInsertDelete="YES" id="Bd9-d7-YLd" customClass="GICommitMessageView">
227227
<rect key="frame" x="0.0" y="0.0" width="548" height="98"/>
228228
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
229229
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
230230
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
231231
<size key="minSize" width="548" height="98"/>
232-
<size key="maxSize" width="608" height="10000000"/>
232+
<size key="maxSize" width="562" height="10000000"/>
233233
<attributedString key="textStorage">
234234
<fragment content="&lt;MESSAGE&gt;">
235235
<attributes>
@@ -241,43 +241,43 @@ DQ
241241
</attributedString>
242242
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
243243
<connections>
244-
<outlet property="delegate" destination="-2" id="kk3-aI-fXa"/>
244+
<outlet property="delegate" destination="-2" id="r9O-yb-7mj"/>
245245
</connections>
246246
</textView>
247247
</subviews>
248248
</clipView>
249-
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="IXc-Ye-G0z">
249+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="OB0-eb-G64">
250250
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
251251
<autoresizingMask key="autoresizingMask"/>
252252
</scroller>
253-
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="itL-Vx-dgv">
253+
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="b0J-i3-bDd">
254254
<rect key="frame" x="224" y="1" width="15" height="133"/>
255255
<autoresizingMask key="autoresizingMask"/>
256256
</scroller>
257257
</scrollView>
258-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Mi2-Di-27H">
258+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="VJr-bi-EjL">
259259
<rect key="frame" x="18" y="189" width="183" height="17"/>
260260
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
261-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="New commit message:" id="Rs6-wQ-uAF">
261+
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Old commit message:" id="3xC-Vl-BIN">
262262
<font key="font" metaFont="system"/>
263263
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
264264
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
265265
</textFieldCell>
266266
</textField>
267-
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="FGz-GT-MFK">
267+
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="sdt-ps-l95">
268268
<rect key="frame" x="20" y="81" width="550" height="100"/>
269269
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
270-
<clipView key="contentView" drawsBackground="NO" id="iv1-rd-iqv">
270+
<clipView key="contentView" drawsBackground="NO" id="sKA-Dg-4u7">
271271
<rect key="frame" x="1" y="1" width="548" height="98"/>
272272
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
273273
<subviews>
274-
<textView importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" smartInsertDelete="YES" id="Bd9-d7-YLd" customClass="GICommitMessageView">
274+
<textView importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" smartInsertDelete="YES" id="C9q-53-7wr" customClass="GICommitMessageView">
275275
<rect key="frame" x="0.0" y="0.0" width="548" height="98"/>
276276
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
277277
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
278278
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
279279
<size key="minSize" width="548" height="98"/>
280-
<size key="maxSize" width="562" height="10000000"/>
280+
<size key="maxSize" width="608" height="10000000"/>
281281
<attributedString key="textStorage">
282282
<fragment content="&lt;MESSAGE&gt;">
283283
<attributes>
@@ -289,16 +289,16 @@ DQ
289289
</attributedString>
290290
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
291291
<connections>
292-
<outlet property="delegate" destination="-2" id="r9O-yb-7mj"/>
292+
<outlet property="delegate" destination="-2" id="kk3-aI-fXa"/>
293293
</connections>
294294
</textView>
295295
</subviews>
296296
</clipView>
297-
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="OB0-eb-G64">
297+
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="IXc-Ye-G0z">
298298
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
299299
<autoresizingMask key="autoresizingMask"/>
300300
</scroller>
301-
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="b0J-i3-bDd">
301+
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="itL-Vx-dgv">
302302
<rect key="frame" x="224" y="1" width="15" height="133"/>
303303
<autoresizingMask key="autoresizingMask"/>
304304
</scroller>

0 commit comments

Comments
 (0)