Skip to content

Commit

Permalink
Another attempt to fix the cog menus on 10.10
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@dmoagx
dmoagx committed Nov 21, 2014
1 parent c1092da commit d2919fc
Show file tree
Hide file tree
Showing 9 changed files with 8,514 additions and 606 deletions.
639 changes: 612 additions & 27 deletions Interfaces/English.lproj/BundleEditor.xib
View file

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions Interfaces/English.lproj/ConnectionView.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">13C64</string>
<string key="IBDocument.InterfaceBuilderVersion">4514</string>
<string key="IBDocument.AppKitVersion">1265.19</string>
<string key="IBDocument.HIToolboxVersion">697.40</string>
<string key="IBDocument.SystemVersion">13F34</string>
<string key="IBDocument.InterfaceBuilderVersion">5056</string>
<string key="IBDocument.AppKitVersion">1265.21</string>
<string key="IBDocument.HIToolboxVersion">698.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">4514</string>
<string key="NS.object.0">5056</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
Expand Down Expand Up @@ -76,7 +76,7 @@
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</set>
<string key="NSFrame">{{0, 1}, {202, 22}}</string>
<string key="NSFrame">{{0, 1}, {200, 22}}</string>
<reference key="NSSuperview" ref="551584428"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="29465158"/>
Expand Down Expand Up @@ -157,22 +157,18 @@
<object class="NSPopUpButton" id="735633081">
<reference key="NSNextResponder" ref="551584428"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-1, -1}, {36, 25}}</string>
<string key="NSFrame">{{-2, 0}, {36, 23}}</string>
<reference key="NSSuperview" ref="551584428"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="524598165"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="970960222">
<int key="NSCellFlags">71303232</int>
<int key="NSCellFlags2">134350848</int>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">.LucidaGrandeUI</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<int key="NSCellFlags">67108928</int>
<int key="NSCellFlags2">134219776</int>
<reference key="NSSupport" ref="807120225"/>
<reference key="NSControlView" ref="735633081"/>
<int key="NSButtonFlags">-2044051456</int>
<int key="NSButtonFlags2">35</int>
<int key="NSButtonFlags2">2</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Expand Down Expand Up @@ -390,7 +386,7 @@
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</set>
<string key="NSFrame">{{187, 1}, {15, 22}}</string>
<string key="NSFrame">{{185, 1}, {15, 22}}</string>
<reference key="NSSuperview" ref="551584428"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="563806501"/>
Expand Down Expand Up @@ -421,7 +417,7 @@
<object class="NSTableView" id="1012579052">
<reference key="NSNextResponder" ref="233523429"/>
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{202, 489}</string>
<string key="NSFrameSize">{200, 489}</string>
<reference key="NSSuperview" ref="233523429"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="533108700"/>
Expand All @@ -435,14 +431,18 @@
</object>
<array class="NSMutableArray" key="NSTableColumns">
<object class="NSTableColumn" id="131458815">
<double key="NSWidth">199</double>
<double key="NSWidth">197</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Favorites</string>
<reference key="NSSupport" ref="26"/>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">.LucidaGrandeUI</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
Expand Down Expand Up @@ -521,7 +521,7 @@
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</array>
<string key="NSFrameSize">{202, 489}</string>
<string key="NSFrameSize">{200, 489}</string>
<reference key="NSSuperview" ref="524598165"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1012579052"/>
Expand Down Expand Up @@ -558,7 +558,7 @@
<double key="NSPercent">0.99507391452789307</double>
</object>
</array>
<string key="NSFrame">{{0, 23}, {202, 489}}</string>
<string key="NSFrame">{{0, 23}, {200, 489}}</string>
<reference key="NSSuperview" ref="551584428"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="233523429"/>
Expand All @@ -572,7 +572,7 @@
<double key="NSMagnification">1</double>
</object>
</array>
<string key="NSFrameSize">{202, 513}</string>
<string key="NSFrameSize">{200, 513}</string>
<reference key="NSSuperview" ref="616749187"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="735633081"/>
Expand Down Expand Up @@ -1523,7 +1523,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{328, 12}, {29, 24}}</string>
<reference key="NSSuperview" ref="866600720"/>
<reference key="NSNextKeyView" ref="990947983"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="308087760">
<int key="NSCellFlags">67108864</int>
Expand Down Expand Up @@ -2281,7 +2280,7 @@
<string key="NSFrame">{{328, 12}, {29, 24}}</string>
<reference key="NSSuperview" ref="709218819"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="990947983"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="345867488">
<int key="NSCellFlags">67108864</int>
Expand Down Expand Up @@ -2474,7 +2473,7 @@
<string key="NSFrame">{{285, 33}, {147, 32}}</string>
<reference key="NSSuperview" ref="735564334"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="508899576"/>
<reference key="NSNextKeyView" ref="108277656"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="424756162">
<int key="NSCellFlags">67108864</int>
Expand Down Expand Up @@ -2546,21 +2545,21 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrame">{{116, 5}, {446, 472}}</string>
<string key="NSFrame">{{116.5, 5}, {446, 472}}</string>
<reference key="NSSuperview" ref="315390047"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="134031646"/>
<string key="NSClassName">NSCustomView</string>
</object>
</array>
<string key="NSFrameSize">{679, 480}</string>
<string key="NSFrameSize">{681, 480}</string>
<reference key="NSSuperview" ref="954788335"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="735564334"/>
<string key="NSClassName">SPFlippedView</string>
</object>
</array>
<string key="NSFrameSize">{679, 481}</string>
<string key="NSFrameSize">{681, 481}</string>
<reference key="NSSuperview" ref="1058735001"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="315390047"/>
Expand All @@ -2574,27 +2573,28 @@
<string key="NSFrame">{{663, 0}, {16, 580}}</string>
<reference key="NSSuperview" ref="1058735001"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="108277656"/>
<reference key="NSNextKeyView"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="1058735001"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.99827882960413084</double>
<double key="NSPercent">0.97083333333333333</double>
</object>
<object class="NSScroller" id="108277656">
<reference key="NSNextResponder" ref="1058735001"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{0, 466}, {663, 15}}</string>
<reference key="NSSuperview" ref="1058735001"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="508899576"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1058735001"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.9779086892488954</double>
</object>
</array>
<string key="NSFrameSize">{679, 481}</string>
<string key="NSFrameSize">{681, 481}</string>
<reference key="NSSuperview" ref="563806501"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="954788335"/>
Expand All @@ -2609,7 +2609,7 @@
<object class="NSTextField" id="570492783">
<reference key="NSNextResponder" ref="563806501"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{17, 489}, {645, 17}}</string>
<string key="NSFrame">{{17, 489}, {647, 17}}</string>
<reference key="NSSuperview" ref="563806501"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1058735001"/>
Expand All @@ -2631,7 +2631,7 @@
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object>
</array>
<string key="NSFrame">{{203, 0}, {679, 513}}</string>
<string key="NSFrame">{{201, 0}, {681, 513}}</string>
<reference key="NSSuperview" ref="616749187"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="570492783"/>
Expand Down Expand Up @@ -2861,7 +2861,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67110917</int>
<int key="NSFlags">2053</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="402194341"/>
Expand Down
27 changes: 15 additions & 12 deletions Interfaces/English.lproj/Console.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">13E28</string>
<string key="IBDocument.SystemVersion">13F34</string>
<string key="IBDocument.InterfaceBuilderVersion">5056</string>
<string key="IBDocument.AppKitVersion">1265.21</string>
<string key="IBDocument.HIToolboxVersion">698.00</string>
Expand Down Expand Up @@ -103,7 +103,6 @@
<string key="NSFrame">{{399, 2}, {166, 17}}</string>
<reference key="NSSuperview" ref="215475093"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="95087038">
<int key="NSCellFlags">67108864</int>
Expand Down Expand Up @@ -210,7 +209,7 @@
<string key="NSFrameSize">{576, 126}</string>
<reference key="NSSuperview" ref="264199078"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="464398489"/>
<reference key="NSNextKeyView" ref="444118053"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
Expand All @@ -223,10 +222,12 @@
<reference key="NSNextKeyView" ref="264199078"/>
<reference key="NSTableView" ref="243353733"/>
</object>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<object class="_NSCornerView" key="NSCornerView" id="624034762">
<reference key="NSNextResponder" ref="865703622"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="865703622"/>
<reference key="NSWindow"/>
</object>
<array class="NSMutableArray" key="NSTableColumns">
<object class="NSTableColumn" id="424669154">
Expand Down Expand Up @@ -426,16 +427,18 @@
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.57142859697341919</double>
</object>
<reference ref="624034762"/>
</array>
<string key="NSFrame">{{-1, 22}, {578, 144}}</string>
<reference key="NSSuperview" ref="215475093"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="444118053"/>
<reference key="NSNextKeyView" ref="264199078"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="464398489"/>
<reference key="NSHScroller" ref="444118053"/>
<reference key="NSContentView" ref="264199078"/>
<reference key="NSHeaderClipView" ref="486423323"/>
<reference key="NSCornerView" ref="624034762"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
Expand Down Expand Up @@ -486,18 +489,18 @@
<object class="NSPopUpButton" id="544468485">
<reference key="NSNextResponder" ref="215475093"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{-10, 0}, {46, 25}}</string>
<string key="NSFrame">{{-2, 0}, {36, 23}}</string>
<reference key="NSSuperview" ref="215475093"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="865703622"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="146997448">
<int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags">-2080374720</int>
<int key="NSCellFlags2">134219776</int>
<reference key="NSSupport" ref="1012436895"/>
<reference key="NSControlView" ref="544468485"/>
<int key="NSButtonFlags">-2042609664</int>
<int key="NSButtonFlags2">35</int>
<int key="NSButtonFlags">-2044182528</int>
<int key="NSButtonFlags2">2</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
Expand Down Expand Up @@ -596,7 +599,7 @@
</object>
</array>
</object>
<int key="NSSelectedIndex">-1</int>
<int key="NSSelectedIndex">1</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
Expand Down Expand Up @@ -1073,9 +1076,9 @@
<reference ref="688790145"/>
<reference ref="223792049"/>
<reference ref="591384017"/>
<reference ref="544468485"/>
<reference ref="301104034"/>
<reference ref="865703622"/>
<reference ref="544468485"/>
</array>
<reference key="parent" ref="209913341"/>
</object>
Expand Down
Loading

0 comments on commit d2919fc

Please sign in to comment.