colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-06 00:52:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cappuccino/cappuccino

Browse Source
This commit is contained in:
Alexander Ljungberg committed 2012-07-18 19:21:43 +01:00
2 parents b0a56f1690 8444f808f6
commit f4f9e8880c
5 files changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPControl.j
+1 -1
View File
@@ -112,7 +112,7 @@ var CPControlBlackColor = [CPColor blackColor];
CPTopVerticalTextAlignment,
CPLineBreakByClipping,
[CPColor blackColor],
[CPFont systemFontOfSize:12.0],
[CPFont systemFontOfSize:CPFontCurrentSystemSize],
[CPNull null],
_CGSizeMakeZero(),
CPImageLeft,
AppKit/Themes/BlendKit/BKThemeDescriptor.j
+1 -1
View File
@@ -181,7 +181,7 @@ var ItemSizes = { },
if ([object isKindOfClass:[CPView class]])
{
var size = [object frame].size,
labelWidth = [[template valueForKey:@"label"] sizeWithFont:[CPFont boldSystemFontOfSize:12.0]].width + 20.0;
labelWidth = [[template valueForKey:@"label"] sizeWithFont:[CPFont boldSystemFontOfSize:0]].width + 20.0;
if (size.width > itemSize.width)
itemSize.width = size.width;
AppKit/Themes/Default/AppController.j
+1 -1
View File
@@ -142,7 +142,7 @@
[_label setAlignment:CPCenterTextAlignment];
[_label setAutoresizingMask:CPViewMinYMargin | CPViewWidthSizable];
[_label setFont:[CPFont boldSystemFontOfSize:12.0]];
[_label setFont:[CPFont boldSystemFontOfSize:0]];
[self addSubview:_label];
}
Foundation/_CGGeometry.h
+1
View File
@@ -80,6 +80,7 @@ CGGeometry is not a part of Foundation. The reason _CGGeometry.h exists, and is
#define _CGInsetMake(_top, _right, _bottom, _left) { top:(_top), right:(_right), bottom:(_bottom), left:(_left) }
#define _CGInsetMakeCopy(anInset) _CGInsetMake(anInset.top, anInset.right, anInset.bottom, anInset.left)
#define _CGInsetMakeInvertedCopy(anInset) _CGInsetMake(-anInset.top, -anInset.right, -anInset.bottom, -anInset.left)
#define _CGInsetMakeZero() _CGInsetMake(0, 0, 0, 0)
#define _CGInsetIsEmpty(anInset) ((anInset).top === 0 && (anInset).right === 0 && (anInset).bottom === 0 && (anInset).left === 0)
#define _CGInsetEqualToInset(lhsInset, rhsInset) ((lhsInset).top === (rhsInset).top && (lhsInset).right === (rhsInset).right && (lhsInset).bottom === (rhsInset).bottom && (lhsInset).left === (rhsInset).left)
Foundation/_CGGeometry.j
+1
View File
@@ -72,6 +72,7 @@ _function(CGRectContainsPoint(aRect, aPoint))
_function(CGInsetMake(top, right, bottom, left))
_function(CGInsetMakeZero())
_function(CGInsetMakeCopy(anInset))
_function(CGInsetMakeInvertedCopy(anInset))
_function(CGInsetIsEmpty(anInset))
_function(CGInsetEqualToInset(lhsInset, rhsInset))