Skip to content

Commit 3973ee4

Browse files
zwaldowskilucasderraugh
zwaldowski
authored and
lucasderraugh
committed
Fix inappropriate use of textured round button styles (#564)
* Reenable view debugger * Fix inappropriate use of textured round button styles
1 parent 9128e38 commit 3973ee4

File tree

10 files changed

+61
-62
lines changed

10 files changed

+61
-62
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ Adjust settings in Show menu</string>
229229
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
230230
</box>
231231
<popUpButton id="Fov-GV-gD7">
232-
<rect key="frame" x="12" y="12" width="80" height="23"/>
232+
<rect key="frame" x="11" y="9" width="82" height="25"/>
233233
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
234-
<popUpButtonCell key="cell" type="roundTextured" title="Show" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" preferredEdge="maxY" selectedItem="9kl-kD-1vf" id="6Tc-ix-fh5">
235-
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
234+
<popUpButtonCell key="cell" type="push" title="Show" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" preferredEdge="maxY" selectedItem="9kl-kD-1vf" id="6Tc-ix-fh5">
235+
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
236236
<font key="font" metaFont="system"/>
237237
<menu key="menu" id="FSB-Wc-ZmT">
238238
<items>
@@ -307,9 +307,9 @@ Adjust settings in Show menu</string>
307307
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
308308
</progressIndicator>
309309
<button toolTip="Pull current branch from upstream" verticalHuggingPriority="750" id="bVm-VR-ap5">
310-
<rect key="frame" x="930" y="12" width="27" height="23"/>
310+
<rect key="frame" x="926" y="5" width="37" height="32"/>
311311
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
312-
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="icon_action_fetch" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="SFq-Wx-Us0">
312+
<buttonCell key="cell" type="push" bezelStyle="rounded" image="icon_action_fetch" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="SFq-Wx-Us0">
313313
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
314314
<font key="font" metaFont="system"/>
315315
</buttonCell>
@@ -318,9 +318,9 @@ Adjust settings in Show menu</string>
318318
</connections>
319319
</button>
320320
<button toolTip="Push current branch to upstream" verticalHuggingPriority="750" id="NjF-Aj-I7c">
321-
<rect key="frame" x="961" y="12" width="27" height="23"/>
321+
<rect key="frame" x="955" y="5" width="37" height="32"/>
322322
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
323-
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="icon_action_push" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="dhk-Ry-6pb">
323+
<buttonCell key="cell" type="push" bezelStyle="rounded" image="icon_action_push" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="dhk-Ry-6pb">
324324
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
325325
<font key="font" metaFont="system"/>
326326
</buttonCell>
@@ -373,9 +373,9 @@ Adjust settings in Show menu</string>
373373
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
374374
</customView>
375375
<button verticalHuggingPriority="750" id="bvP-z4-n9x">
376-
<rect key="frame" x="90" y="12" width="80" height="23"/>
376+
<rect key="frame" x="86" y="5" width="88" height="32"/>
377377
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
378-
<buttonCell key="cell" type="roundTextured" title="Done" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QV1-K4-raG">
378+
<buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="QV1-K4-raG">
379379
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
380380
<font key="font" metaFont="system"/>
381381
</buttonCell>
@@ -403,9 +403,9 @@ Adjust settings in Show menu</string>
403403
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
404404
</customView>
405405
<button verticalHuggingPriority="750" id="6Ni-2N-Ux7">
406-
<rect key="frame" x="90" y="12" width="80" height="23"/>
406+
<rect key="frame" x="86" y="5" width="88" height="32"/>
407407
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
408-
<buttonCell key="cell" type="roundTextured" title="Done" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G4D-l9-GAh">
408+
<buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="G4D-l9-GAh">
409409
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
410410
<font key="font" metaFont="system"/>
411411
</buttonCell>
@@ -435,9 +435,9 @@ Adjust settings in Show menu</string>
435435
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
436436
</customView>
437437
<button verticalHuggingPriority="750" id="rOD-bh-eJs">
438-
<rect key="frame" x="90" y="12" width="80" height="23"/>
438+
<rect key="frame" x="86" y="5" width="88" height="32"/>
439439
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
440-
<buttonCell key="cell" type="roundTextured" title="Done" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mu6-y9-mEl">
440+
<buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mu6-y9-mEl">
441441
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
442442
<font key="font" metaFont="system"/>
443443
</buttonCell>
@@ -465,9 +465,9 @@ Adjust settings in Show menu</string>
465465
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
466466
</customView>
467467
<button verticalHuggingPriority="750" id="l3F-kQ-tsG">
468-
<rect key="frame" x="90" y="12" width="80" height="23"/>
468+
<rect key="frame" x="86" y="5" width="88" height="32"/>
469469
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
470-
<buttonCell key="cell" type="roundTextured" title="Done" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Vb7-E2-czh">
470+
<buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Vb7-E2-czh">
471471
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
472472
<font key="font" metaFont="system"/>
473473
</buttonCell>

‎GitUp/Application/Document.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController*)windowController {
376376
_searchField.enabled = NO;
377377

378378
for (NSMenuItem* item in _showMenu.itemArray) { // We don't want first responder targets
379-
if (![item isSeparatorItem]) {
379+
if (item.target == nil && item.action != NULL) {
380380
item.target = _mapViewController;
381381
}
382382
}
@@ -725,10 +725,10 @@ - (void)_updateStatusBar {
725725
NSRect frame = _pullButton.frame;
726726
if (isBehind) {
727727
_pullButton.image = [NSImage imageNamed:@"icon_action_fetch_new"];
728-
_pullButton.frame = NSMakeRect(frame.origin.x + frame.size.width - 44, frame.origin.y, 44, frame.size.height);
728+
_pullButton.frame = NSMakeRect(frame.origin.x + frame.size.width - 53, frame.origin.y, 53, frame.size.height);
729729
} else {
730730
_pullButton.image = [NSImage imageNamed:@"icon_action_fetch"];
731-
_pullButton.frame = NSMakeRect(frame.origin.x + frame.size.width - 27, frame.origin.y, 27, frame.size.height);
731+
_pullButton.frame = NSMakeRect(frame.origin.x + frame.size.width - 37, frame.origin.y, 37, frame.size.height);
732732
}
733733
_pushButton.hidden = NO;
734734
_pushButton.enabled = [_mapViewController validateUserInterfaceItem:(id)_pushButton];

‎GitUp/GitUp.xcodeproj/xcshareddata/xcschemes/Application.xcscheme

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "NO">
30-
<Testables>
31-
</Testables>
3230
<AdditionalOptions>
3331
<AdditionalOption
3432
key = "NSZombieEnabled"
3533
value = "YES"
3634
isEnabled = "YES">
3735
</AdditionalOption>
3836
</AdditionalOptions>
37+
<Testables>
38+
</Testables>
3939
</TestAction>
4040
<LaunchAction
4141
buildConfiguration = "Debug"
@@ -48,8 +48,7 @@
4848
debugDocumentVersioning = "NO"
4949
debugXPCServices = "NO"
5050
debugServiceExtension = "internal"
51-
allowLocationSimulation = "NO"
52-
viewDebuggingEnabled = "No">
51+
allowLocationSimulation = "NO">
5352
<BuildableProductRunnable
5453
runnableDebuggingMode = "0">
5554
<BuildableReference

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
8282
</customView>
8383
<button verticalHuggingPriority="750" id="4zE-Zk-8sX">
84-
<rect key="frame" x="12" y="9" width="114" height="23"/>
84+
<rect key="frame" x="8" y="4" width="120" height="32"/>
8585
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
86-
<buttonCell key="cell" type="roundTextured" title="Discard All…" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ld8-vc-cxM">
86+
<buttonCell key="cell" type="push" title="Discard All…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ld8-vc-cxM">
8787
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
8888
<font key="font" metaFont="system"/>
8989
<string key="keyEquivalent">d</string>
@@ -94,9 +94,9 @@
9494
</connections>
9595
</button>
9696
<button verticalHuggingPriority="750" id="nf2-5l-LHg">
97-
<rect key="frame" x="174" y="9" width="114" height="23"/>
97+
<rect key="frame" x="172" y="4" width="120" height="32"/>
9898
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
99-
<buttonCell key="cell" type="roundTextured" title="Stage All" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ia5-7P-vyF">
99+
<buttonCell key="cell" type="push" title="Stage All" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ia5-7P-vyF">
100100
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
101101
<font key="font" metaFont="system"/>
102102
<string key="keyEquivalent">s</string>
@@ -235,9 +235,9 @@
235235
</connections>
236236
</button>
237237
<button verticalHuggingPriority="750" id="mNK-0g-48P">
238-
<rect key="frame" x="876" y="12" width="112" height="23"/>
238+
<rect key="frame" x="872" y="5" width="120" height="32"/>
239239
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
240-
<buttonCell key="cell" type="roundTextured" title="Commit" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="GtK-Iv-qM4">
240+
<buttonCell key="cell" type="push" title="Commit" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="GtK-Iv-qM4">
241241
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
242242
<font key="font" metaFont="system"/>
243243
<string key="keyEquivalent" base64-UTF8="YES">
@@ -259,9 +259,9 @@ DQ
259259
</textFieldCell>
260260
</textField>
261261
<button verticalHuggingPriority="750" id="0n6-Tx-H9g">
262-
<rect key="frame" x="12" y="12" width="114" height="23"/>
262+
<rect key="frame" x="8" y="5" width="122" height="32"/>
263263
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
264-
<buttonCell key="cell" type="roundTextured" title="Unstage All" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oqv-6o-u68">
264+
<buttonCell key="cell" type="push" title="Unstage All" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oqv-6o-u68">
265265
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
266266
<font key="font" metaFont="system"/>
267267
<string key="keyEquivalent">u</string>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7070
</customView>
7171
<button verticalHuggingPriority="750" id="MQE-ts-iIn">
72-
<rect key="frame" x="12" y="12" width="84" height="23"/>
72+
<rect key="frame" x="8" y="5" width="100" height="32"/>
7373
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
74-
<buttonCell key="cell" type="roundTextured" title="Cancel" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mX3-eO-IXN">
74+
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mX3-eO-IXN">
7575
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
7676
<font key="font" metaFont="system"/>
7777
<string key="keyEquivalent" base64-UTF8="YES">
@@ -83,9 +83,9 @@ Gw
8383
</connections>
8484
</button>
8585
<button verticalHuggingPriority="750" id="3PR-J1-aKE">
86-
<rect key="frame" x="184" y="12" width="104" height="23"/>
86+
<rect key="frame" x="180" y="5" width="112" height="32"/>
8787
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
88-
<buttonCell key="cell" type="roundTextured" title="Continue…" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ibk-mz-3rz">
88+
<buttonCell key="cell" type="push" title="Continue…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ibk-mz-3rz">
8989
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
9090
<font key="font" metaFont="system"/>
9191
<string key="keyEquivalent" base64-UTF8="YES">
@@ -186,7 +186,7 @@ DQ
186186
</textFieldCell>
187187
</textField>
188188
<button verticalHuggingPriority="750" id="jiN-49-CJi">
189-
<rect key="frame" x="442" y="13" width="134" height="32"/>
189+
<rect key="frame" x="434" y="13" width="142" height="32"/>
190190
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
191191
<buttonCell key="cell" type="push" title="Rewrite Commit" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="JGJ-zD-wfi">
192192
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -201,7 +201,7 @@ DQ
201201
</connections>
202202
</button>
203203
<button verticalHuggingPriority="750" id="2mu-cU-csS">
204-
<rect key="frame" x="348" y="13" width="92" height="32"/>
204+
<rect key="frame" x="334" y="13" width="100" height="32"/>
205205
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
206206
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="GL2-s4-e19">
207207
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

0 commit comments

Comments
 (0)