colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-28 22:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1589 from slevenbits/nib2cib-fixes

Browse Source 
nib2cib fixes
This commit is contained in:
aparajita
2012-07-02 06:57:09 -07:00
parent 8651a59f43 2f27291c53
commit fb590550cd
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/nib2cib/NSButton.j
+4 -1
View File
@@ -118,6 +118,7 @@ var NSButtonIsBorderedMask = 0x00800000,
NIB_CONNECTION_EQUIVALENCY_TABLE[[cell UID]] = self;
_title = [cell title];
_alternateTitle = [cell alternateTitle];
_controlSize = CPRegularControlSize;
[self setBordered:[cell isBordered]];
@@ -254,6 +255,7 @@ var NSButtonIsBorderedMask = 0x00800000,
int _bezelStyle @accessors(readonly, getter=bezelStyle);
CPString _title @accessors(readonly, getter=title);
CPString _alternateTitle @accessors(readonly, getter=alternateTitle);
CPImage _normalImage @accessors(readonly, getter=normalImage);
CPImage _alternateImage @accessors(readonly, getter=alternateImage);
@@ -281,8 +283,9 @@ var NSButtonIsBorderedMask = 0x00800000,
_isBordered = (buttonFlags & NSButtonIsBorderedMask) ? YES : NO;
_bezelStyle = (buttonFlags2 & 0x7) | ((buttonFlags2 & 0x20) >> 2);
// NSContents for NSButton is actually the title
// NSContents/NSAlternateContents for NSButton is actually the title/alternate title
_title = [aCoder decodeObjectForKey:@"NSContents"];
_alternateTitle = [aCoder decodeObjectForKey:@"NSAlternateContents"];
// ... and _objectValue is _state
_objectValue = [self state];
Tools/nib2cib/NSCustomResource.j
+1 -1
View File
@@ -65,7 +65,7 @@ var FILE = require("file"),
if (resourcePath && FILE.extension(resourcePath) !== FILE.extension(_resourceName))
_resourceName += FILE.extension(resourcePath);
CPLog.debug("Image path: %s\nImage size: %dx%d", FILE.canonical(resourcePath), size.width, size.height);
CPLog.debug(" Path: %s\n Size: %dx%d", FILE.canonical(resourcePath), size.width, size.height);
}
_properties = [CPDictionary dictionaryWithObject:size forKey:@"size"];