Skip to content

Commit d2919fc

Browse files
dmoagxdmoagx
committed
Another attempt to fix the cog menus on 10.10
Previously our cog menus have been Round Rect (borderless) NSPopupButtons with text aligned to the left of the image as that combination would allow us to make the box of the button exactly as big as the image. However in 10.10 Apple changed the layout so that a padding is always added on the right border of a popup button (except if the menu is attached to the left). From playing around I found the only setting to be compatible between 10.9 and 10.10 to be the button type Bevel (borderless). This commit changes all cog buttons to Bevel type in hopes those will also look the same on 10.8, 10.7, 10.6.
1 parent c1092da commit d2919fc

9 files changed

+8514
-606
lines changed

‎Interfaces/English.lproj/BundleEditor.xib

+612-27
Large diffs are not rendered by default.

‎Interfaces/English.lproj/ConnectionView.xib

+34-34
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
33
<data>
44
<int key="IBDocument.SystemTarget">1060</int>
5-
<string key="IBDocument.SystemVersion">13C64</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">4514</string>
7-
<string key="IBDocument.AppKitVersion">1265.19</string>
8-
<string key="IBDocument.HIToolboxVersion">697.40</string>
5+
<string key="IBDocument.SystemVersion">13F34</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">5056</string>
7+
<string key="IBDocument.AppKitVersion">1265.21</string>
8+
<string key="IBDocument.HIToolboxVersion">698.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
11-
<string key="NS.object.0">4514</string>
11+
<string key="NS.object.0">5056</string>
1212
</object>
1313
<array key="IBDocument.IntegratedClassDependencies">
1414
<string>NSButton</string>
@@ -76,7 +76,7 @@
7676
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
7777
<string>NeXT TIFF v4.0 pasteboard type</string>
7878
</set>
79-
<string key="NSFrame">{{0, 1}, {202, 22}}</string>
79+
<string key="NSFrame">{{0, 1}, {200, 22}}</string>
8080
<reference key="NSSuperview" ref="551584428"/>
8181
<reference key="NSWindow"/>
8282
<reference key="NSNextKeyView" ref="29465158"/>
@@ -157,22 +157,18 @@
157157
<object class="NSPopUpButton" id="735633081">
158158
<reference key="NSNextResponder" ref="551584428"/>
159159
<int key="NSvFlags">292</int>
160-
<string key="NSFrame">{{-1, -1}, {36, 25}}</string>
160+
<string key="NSFrame">{{-2, 0}, {36, 23}}</string>
161161
<reference key="NSSuperview" ref="551584428"/>
162162
<reference key="NSWindow"/>
163163
<reference key="NSNextKeyView" ref="524598165"/>
164164
<bool key="NSEnabled">YES</bool>
165165
<object class="NSPopUpButtonCell" key="NSCell" id="970960222">
166-
<int key="NSCellFlags">71303232</int>
167-
<int key="NSCellFlags2">134350848</int>
168-
<object class="NSFont" key="NSSupport" id="26">
169-
<string key="NSName">.LucidaGrandeUI</string>
170-
<double key="NSSize">11</double>
171-
<int key="NSfFlags">3100</int>
172-
</object>
166+
<int key="NSCellFlags">67108928</int>
167+
<int key="NSCellFlags2">134219776</int>
168+
<reference key="NSSupport" ref="807120225"/>
173169
<reference key="NSControlView" ref="735633081"/>
174170
<int key="NSButtonFlags">-2044051456</int>
175-
<int key="NSButtonFlags2">35</int>
171+
<int key="NSButtonFlags2">2</int>
176172
<string key="NSAlternateContents"/>
177173
<string key="NSKeyEquivalent"/>
178174
<int key="NSPeriodicDelay">400</int>
@@ -390,7 +386,7 @@
390386
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
391387
<string>NeXT TIFF v4.0 pasteboard type</string>
392388
</set>
393-
<string key="NSFrame">{{187, 1}, {15, 22}}</string>
389+
<string key="NSFrame">{{185, 1}, {15, 22}}</string>
394390
<reference key="NSSuperview" ref="551584428"/>
395391
<reference key="NSWindow"/>
396392
<reference key="NSNextKeyView" ref="563806501"/>
@@ -421,7 +417,7 @@
421417
<object class="NSTableView" id="1012579052">
422418
<reference key="NSNextResponder" ref="233523429"/>
423419
<int key="NSvFlags">4352</int>
424-
<string key="NSFrameSize">{202, 489}</string>
420+
<string key="NSFrameSize">{200, 489}</string>
425421
<reference key="NSSuperview" ref="233523429"/>
426422
<reference key="NSWindow"/>
427423
<reference key="NSNextKeyView" ref="533108700"/>
@@ -435,14 +431,18 @@
435431
</object>
436432
<array class="NSMutableArray" key="NSTableColumns">
437433
<object class="NSTableColumn" id="131458815">
438-
<double key="NSWidth">199</double>
434+
<double key="NSWidth">197</double>
439435
<double key="NSMinWidth">40</double>
440436
<double key="NSMaxWidth">1000</double>
441437
<object class="NSTableHeaderCell" key="NSHeaderCell">
442438
<int key="NSCellFlags">75497536</int>
443439
<int key="NSCellFlags2">2048</int>
444440
<string key="NSContents">Favorites</string>
445-
<reference key="NSSupport" ref="26"/>
441+
<object class="NSFont" key="NSSupport" id="26">
442+
<string key="NSName">.LucidaGrandeUI</string>
443+
<double key="NSSize">11</double>
444+
<int key="NSfFlags">3100</int>
445+
</object>
446446
<object class="NSColor" key="NSBackgroundColor">
447447
<int key="NSColorSpace">3</int>
448448
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
@@ -521,7 +521,7 @@
521521
<int key="NSTableViewGroupRowStyle">1</int>
522522
</object>
523523
</array>
524-
<string key="NSFrameSize">{202, 489}</string>
524+
<string key="NSFrameSize">{200, 489}</string>
525525
<reference key="NSSuperview" ref="524598165"/>
526526
<reference key="NSWindow"/>
527527
<reference key="NSNextKeyView" ref="1012579052"/>
@@ -558,7 +558,7 @@
558558
<double key="NSPercent">0.99507391452789307</double>
559559
</object>
560560
</array>
561-
<string key="NSFrame">{{0, 23}, {202, 489}}</string>
561+
<string key="NSFrame">{{0, 23}, {200, 489}}</string>
562562
<reference key="NSSuperview" ref="551584428"/>
563563
<reference key="NSWindow"/>
564564
<reference key="NSNextKeyView" ref="233523429"/>
@@ -572,7 +572,7 @@
572572
<double key="NSMagnification">1</double>
573573
</object>
574574
</array>
575-
<string key="NSFrameSize">{202, 513}</string>
575+
<string key="NSFrameSize">{200, 513}</string>
576576
<reference key="NSSuperview" ref="616749187"/>
577577
<reference key="NSWindow"/>
578578
<reference key="NSNextKeyView" ref="735633081"/>
@@ -1523,7 +1523,6 @@
15231523
<int key="NSvFlags">268</int>
15241524
<string key="NSFrame">{{328, 12}, {29, 24}}</string>
15251525
<reference key="NSSuperview" ref="866600720"/>
1526-
<reference key="NSNextKeyView" ref="990947983"/>
15271526
<bool key="NSEnabled">YES</bool>
15281527
<object class="NSButtonCell" key="NSCell" id="308087760">
15291528
<int key="NSCellFlags">67108864</int>
@@ -2281,7 +2280,7 @@
22812280
<string key="NSFrame">{{328, 12}, {29, 24}}</string>
22822281
<reference key="NSSuperview" ref="709218819"/>
22832282
<reference key="NSWindow"/>
2284-
<reference key="NSNextKeyView" ref="990947983"/>
2283+
<reference key="NSNextKeyView"/>
22852284
<bool key="NSEnabled">YES</bool>
22862285
<object class="NSButtonCell" key="NSCell" id="345867488">
22872286
<int key="NSCellFlags">67108864</int>
@@ -2474,7 +2473,7 @@
24742473
<string key="NSFrame">{{285, 33}, {147, 32}}</string>
24752474
<reference key="NSSuperview" ref="735564334"/>
24762475
<reference key="NSWindow"/>
2477-
<reference key="NSNextKeyView" ref="508899576"/>
2476+
<reference key="NSNextKeyView" ref="108277656"/>
24782477
<bool key="NSEnabled">YES</bool>
24792478
<object class="NSButtonCell" key="NSCell" id="424756162">
24802479
<int key="NSCellFlags">67108864</int>
@@ -2546,21 +2545,21 @@
25462545
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
25472546
</object>
25482547
</array>
2549-
<string key="NSFrame">{{116, 5}, {446, 472}}</string>
2548+
<string key="NSFrame">{{116.5, 5}, {446, 472}}</string>
25502549
<reference key="NSSuperview" ref="315390047"/>
25512550
<reference key="NSWindow"/>
25522551
<reference key="NSNextKeyView" ref="134031646"/>
25532552
<string key="NSClassName">NSCustomView</string>
25542553
</object>
25552554
</array>
2556-
<string key="NSFrameSize">{679, 480}</string>
2555+
<string key="NSFrameSize">{681, 480}</string>
25572556
<reference key="NSSuperview" ref="954788335"/>
25582557
<reference key="NSWindow"/>
25592558
<reference key="NSNextKeyView" ref="735564334"/>
25602559
<string key="NSClassName">SPFlippedView</string>
25612560
</object>
25622561
</array>
2563-
<string key="NSFrameSize">{679, 481}</string>
2562+
<string key="NSFrameSize">{681, 481}</string>
25642563
<reference key="NSSuperview" ref="1058735001"/>
25652564
<reference key="NSWindow"/>
25662565
<reference key="NSNextKeyView" ref="315390047"/>
@@ -2574,27 +2573,28 @@
25742573
<string key="NSFrame">{{663, 0}, {16, 580}}</string>
25752574
<reference key="NSSuperview" ref="1058735001"/>
25762575
<reference key="NSWindow"/>
2577-
<reference key="NSNextKeyView" ref="108277656"/>
2576+
<reference key="NSNextKeyView"/>
25782577
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
25792578
<reference key="NSTarget" ref="1058735001"/>
25802579
<string key="NSAction">_doScroller:</string>
25812580
<double key="NSCurValue">1</double>
2582-
<double key="NSPercent">0.99827882960413084</double>
2581+
<double key="NSPercent">0.97083333333333333</double>
25832582
</object>
25842583
<object class="NSScroller" id="108277656">
25852584
<reference key="NSNextResponder" ref="1058735001"/>
25862585
<int key="NSvFlags">-2147483392</int>
25872586
<string key="NSFrame">{{0, 466}, {663, 15}}</string>
25882587
<reference key="NSSuperview" ref="1058735001"/>
25892588
<reference key="NSWindow"/>
2589+
<reference key="NSNextKeyView" ref="508899576"/>
25902590
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
25912591
<int key="NSsFlags">1</int>
25922592
<reference key="NSTarget" ref="1058735001"/>
25932593
<string key="NSAction">_doScroller:</string>
25942594
<double key="NSPercent">0.9779086892488954</double>
25952595
</object>
25962596
</array>
2597-
<string key="NSFrameSize">{679, 481}</string>
2597+
<string key="NSFrameSize">{681, 481}</string>
25982598
<reference key="NSSuperview" ref="563806501"/>
25992599
<reference key="NSWindow"/>
26002600
<reference key="NSNextKeyView" ref="954788335"/>
@@ -2609,7 +2609,7 @@
26092609
<object class="NSTextField" id="570492783">
26102610
<reference key="NSNextResponder" ref="563806501"/>
26112611
<int key="NSvFlags">266</int>
2612-
<string key="NSFrame">{{17, 489}, {645, 17}}</string>
2612+
<string key="NSFrame">{{17, 489}, {647, 17}}</string>
26132613
<reference key="NSSuperview" ref="563806501"/>
26142614
<reference key="NSWindow"/>
26152615
<reference key="NSNextKeyView" ref="1058735001"/>
@@ -2631,7 +2631,7 @@
26312631
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
26322632
</object>
26332633
</array>
2634-
<string key="NSFrame">{{203, 0}, {679, 513}}</string>
2634+
<string key="NSFrame">{{201, 0}, {681, 513}}</string>
26352635
<reference key="NSSuperview" ref="616749187"/>
26362636
<reference key="NSWindow"/>
26372637
<reference key="NSNextKeyView" ref="570492783"/>
@@ -2861,7 +2861,7 @@
28612861
<int key="NSTCFlags">1</int>
28622862
</object>
28632863
<object class="NSTextViewSharedData" key="NSSharedData">
2864-
<int key="NSFlags">67110917</int>
2864+
<int key="NSFlags">2053</int>
28652865
<int key="NSTextCheckingTypes">0</int>
28662866
<nil key="NSMarkedAttributes"/>
28672867
<reference key="NSBackgroundColor" ref="402194341"/>

‎Interfaces/English.lproj/Console.xib

+15-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
33
<data>
44
<int key="IBDocument.SystemTarget">1060</int>
5-
<string key="IBDocument.SystemVersion">13E28</string>
5+
<string key="IBDocument.SystemVersion">13F34</string>
66
<string key="IBDocument.InterfaceBuilderVersion">5056</string>
77
<string key="IBDocument.AppKitVersion">1265.21</string>
88
<string key="IBDocument.HIToolboxVersion">698.00</string>
@@ -103,7 +103,6 @@
103103
<string key="NSFrame">{{399, 2}, {166, 17}}</string>
104104
<reference key="NSSuperview" ref="215475093"/>
105105
<reference key="NSWindow"/>
106-
<reference key="NSNextKeyView"/>
107106
<bool key="NSEnabled">YES</bool>
108107
<object class="NSButtonCell" key="NSCell" id="95087038">
109108
<int key="NSCellFlags">67108864</int>
@@ -210,7 +209,7 @@
210209
<string key="NSFrameSize">{576, 126}</string>
211210
<reference key="NSSuperview" ref="264199078"/>
212211
<reference key="NSWindow"/>
213-
<reference key="NSNextKeyView" ref="464398489"/>
212+
<reference key="NSNextKeyView" ref="444118053"/>
214213
<bool key="NSEnabled">YES</bool>
215214
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
216215
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -223,10 +222,12 @@
223222
<reference key="NSNextKeyView" ref="264199078"/>
224223
<reference key="NSTableView" ref="243353733"/>
225224
</object>
226-
<object class="_NSCornerView" key="NSCornerView">
227-
<nil key="NSNextResponder"/>
225+
<object class="_NSCornerView" key="NSCornerView" id="624034762">
226+
<reference key="NSNextResponder" ref="865703622"/>
228227
<int key="NSvFlags">-2147483392</int>
229228
<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
229+
<reference key="NSSuperview" ref="865703622"/>
230+
<reference key="NSWindow"/>
230231
</object>
231232
<array class="NSMutableArray" key="NSTableColumns">
232233
<object class="NSTableColumn" id="424669154">
@@ -426,16 +427,18 @@
426427
<string key="NSAction">_doScroller:</string>
427428
<double key="NSPercent">0.57142859697341919</double>
428429
</object>
430+
<reference ref="624034762"/>
429431
</array>
430432
<string key="NSFrame">{{-1, 22}, {578, 144}}</string>
431433
<reference key="NSSuperview" ref="215475093"/>
432434
<reference key="NSWindow"/>
433-
<reference key="NSNextKeyView" ref="444118053"/>
435+
<reference key="NSNextKeyView" ref="264199078"/>
434436
<int key="NSsFlags">133682</int>
435437
<reference key="NSVScroller" ref="464398489"/>
436438
<reference key="NSHScroller" ref="444118053"/>
437439
<reference key="NSContentView" ref="264199078"/>
438440
<reference key="NSHeaderClipView" ref="486423323"/>
441+
<reference key="NSCornerView" ref="624034762"/>
439442
<bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes>
440443
<double key="NSMinMagnification">0.25</double>
441444
<double key="NSMaxMagnification">4</double>
@@ -486,18 +489,18 @@
486489
<object class="NSPopUpButton" id="544468485">
487490
<reference key="NSNextResponder" ref="215475093"/>
488491
<int key="NSvFlags">292</int>
489-
<string key="NSFrame">{{-10, 0}, {46, 25}}</string>
492+
<string key="NSFrame">{{-2, 0}, {36, 23}}</string>
490493
<reference key="NSSuperview" ref="215475093"/>
491494
<reference key="NSWindow"/>
492495
<reference key="NSNextKeyView" ref="865703622"/>
493496
<bool key="NSEnabled">YES</bool>
494497
<object class="NSPopUpButtonCell" key="NSCell" id="146997448">
495-
<int key="NSCellFlags">-2076180416</int>
498+
<int key="NSCellFlags">-2080374720</int>
496499
<int key="NSCellFlags2">134219776</int>
497500
<reference key="NSSupport" ref="1012436895"/>
498501
<reference key="NSControlView" ref="544468485"/>
499-
<int key="NSButtonFlags">-2042609664</int>
500-
<int key="NSButtonFlags2">35</int>
502+
<int key="NSButtonFlags">-2044182528</int>
503+
<int key="NSButtonFlags2">2</int>
501504
<string key="NSAlternateContents"/>
502505
<string key="NSKeyEquivalent"/>
503506
<int key="NSPeriodicDelay">400</int>
@@ -596,7 +599,7 @@
596599
</object>
597600
</array>
598601
</object>
599-
<int key="NSSelectedIndex">-1</int>
602+
<int key="NSSelectedIndex">1</int>
600603
<bool key="NSPullDown">YES</bool>
601604
<int key="NSPreferredEdge">1</int>
602605
<bool key="NSUsesItemFromMenu">YES</bool>
@@ -1073,9 +1076,9 @@
10731076
<reference ref="688790145"/>
10741077
<reference ref="223792049"/>
10751078
<reference ref="591384017"/>
1076-
<reference ref="544468485"/>
10771079
<reference ref="301104034"/>
10781080
<reference ref="865703622"/>
1081+
<reference ref="544468485"/>
10791082
</array>
10801083
<reference key="parent" ref="209913341"/>
10811084
</object>

0 commit comments

Comments
 (0)