Merge remote-tracking branch 'cappuccino/master'

This commit is contained in:
Didier Korthoudt
2018-05-04 23:22:49 +02:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -378,7 +378,7 @@ CPButtonImageOffset = 3.0;
- (void)setImage:(CPImage)anImage
{
[self setValue:anImage forThemeAttribute:@"image"];
[self setValue:anImage forThemeAttribute:@"image" inState:CPThemeStateNormal];
}
- (CPImage)image
@@ -72,7 +72,7 @@ var CPSourceListDataSource_sourceList_itemHasBadge_ = 1 << 1,
//Make sure that the item has a badge
if (![self itemHasBadge:rowItem])
return CGSizeZero();
return CGSizeMakeZero();
var badgeString = [CPString stringWithFormat:@"%d", [self badgeValueForItem:rowItem]];