colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-07 03:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added explicit size for completeness of sample, fixed font substitution if theme has no font, used LucidaGrande-Bold 13 to do better code coverage.

Browse Source
This commit is contained in:
Aparajita Fishman
2011-03-28 23:55:31 -04:00
parent 044a605e47
commit 90c19b1856
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/Manual/FontEnhancementTest/Info.plist
+4 -2
View File
@@ -6,7 +6,9 @@
<string>MainMenu.cib</string>
<key>CPBundleName</key>
<string>FontEnhancementTest</string>
<key>CPSystemFontFace</key>
<string>Lucida Grande</string>
<key>CPSystemFontFace</key>
<string>Lucida Grande</string>
<key>CPSystemFontSize</key>
<string>12</string>
</dict>
</plist>
Tests/Manual/FontEnhancementTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/FontEnhancementTest/Resources/MainMenu.xib
+12 -8
View File
@@ -842,7 +842,7 @@
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Palatino or</string>
<object class="NSFont" key="NSSupport" id="174154104">
<object class="NSFont" key="NSSupport" id="714389266">
<string key="NSName">Palatino-Roman</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
@@ -863,7 +863,7 @@
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">33554432</int>
<string key="NSContents">Cambria 14</string>
<reference key="NSSupport" ref="174154104"/>
<reference key="NSSupport" ref="714389266"/>
<reference key="NSControlView" ref="1037053875"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">268435456</int>
@@ -1091,9 +1091,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="261632281">
<string key="NSIdentifier">1</string>
<object class="NSView" key="NSView" id="395877833">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="431941332"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 33}, {246, 39}}</string>
<reference key="NSSuperview" ref="431941332"/>
</object>
<string key="NSLabel">Default</string>
<reference key="NSColor" ref="37461814"/>
@@ -1102,23 +1103,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="166375558">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="338115759">
<reference key="NSNextResponder" ref="431941332"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{10, 33}, {246, 39}}</string>
<reference key="NSSuperview" ref="431941332"/>
</object>
<string key="NSLabel">IB font</string>
<reference key="NSColor" ref="37461814"/>
<reference key="NSTabView" ref="431941332"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="166375558"/>
<reference key="NSFont" ref="613390050"/>
<reference key="NSSelectedTabViewItem" ref="261632281"/>
<object class="NSFont" key="NSFont">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="338115759"/>
<reference ref="395877833"/>
</object>
</object>
</object>
Tools/nib2cib/Converter+Mac.j
+13 -4
View File
@@ -23,6 +23,7 @@
@import "Converter.j"
var LegacySystemFontSize
@implementation Converter (Mac)
@@ -36,7 +37,7 @@
// Perform a bit of post-processing on fonts and views since all CP views are flipped.
// It's better to do this here (instead of say, in NSView::initWithCoder:),
// because at this point all the objects an mappings are stabilized.
// because at this point all the objects and mappings are stabilized.
while (count--)
{
var object = objects[count];
@@ -128,15 +129,23 @@
{
var source = "";
// nil cibFont means try to use theme font
if (!cibFont)
{
var bold = [nibFont isBold];
cibFont = [theme valueForAttributeWithName:@"font" inState:[object themeState] forClass:[object class]];
if ([cibFont familyName] === "Arial, sans-serif")
// Substitute legacy theme fonts for the current system font
if (!cibFont || [cibFont familyName] === CPFontDefaultSystemFontFace)
{
var size = [cibFont size];
var size = [cibFont size] || CPFontDefaultSystemFontSize,
bold = cibFont ? [cibFont isBold] : bold;
cibFont = [cibFont isBold] ? [CPFont boldSystemFontOfSize:size] : [CPFont systemFontOfSize:size];
if (size === CPFontDefaultSystemFontSize)
size = [CPFont systemFontSize];
cibFont = bold ? [CPFont boldSystemFontOfSize:size] : [CPFont systemFontOfSize:size];
source = " (from theme)"
}
}