colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-26 05:27:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:tolmasky/cappuccino into tolmasky

Browse Source
This commit is contained in:
Tom Robinson
2009-02-17 17:05:21 -08:00
parent 7c4b1daed6 f6c0d93c47
commit aaa56f7c02
14 changed files with 189 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/nib2cib/NSButton.j
+4 -15
View File
@@ -49,17 +49,6 @@ _CPButtonBezelStyleHeights[CPHUDBezelStyle] = 20;
_isBordered = [cell isBordered];
_bezelStyle = [cell bezelStyle];
var theme = nil,
theClass = [self class];
_bezelInset = CPThemedValueMake(CGInsetMakeZero(), "bezel-inset", theme, theClass);
_contentInset = CPThemedValueMake(CGInsetMakeZero(), "content-inset", theme, theClass);
_bezelColor = CPThemedValueMake(nil, "bezel-color", theme, theClass);
_image = CPThemedValueMake(nil, @"image", theme, theClass);
_title = CPThemedValueMake(nil, @"title", theme, theClass);
// clean up:
switch (_bezelStyle)
@@ -98,11 +87,11 @@ _CPButtonBezelStyleHeights[CPHUDBezelStyle] = 20;
_bezelStyle = CPHUDBezelStyle;
}
if (_CPButtonBezelStyleHeights[_bezelStyle] != undefined)
//if (_CPButtonBezelStyleHeights[_bezelStyle] != undefined)
{
CPLog.warn("Adjusting CPButton height from " +_frame.size.height+ " / " + _bounds.size.height+" to " + _CPButtonBezelStyleHeights[_bezelStyle]);
_frame.size.height = _CPButtonBezelStyleHeights[_bezelStyle];
_bounds.size.height = _CPButtonBezelStyleHeights[_bezelStyle];
//CPLog.warn("Adjusting CPButton height from " +_frame.size.height+ " / " + _bounds.size.height+" to " + _CPButtonBezelStyleHeights[_bezelStyle]);
_frame.size.height = 24.0;//_CPButtonBezelStyleHeights[_bezelStyle];
_bounds.size.height = 24.0;//_CPButtonBezelStyleHeights[_bezelStyle];
}
}