From 57813ea3fb6234601212cb6ff47bf88a6bc77d2f Mon Sep 17 00:00:00 2001 From: Klaas Pieter Annema Date: Wed, 15 Sep 2010 12:34:16 +0200 Subject: [PATCH] change CPButton imageOffset theme property to image-offset --- AppKit/CPButton.j | 8 ++++---- AppKit/Themes/Aristo/ThemeDescriptors.j | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index 231de7d4b..dcd0c8315 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -128,7 +128,7 @@ CPButtonImageOffset = 3.0; + (id)themeAttributes { return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]] - forKeys:[@"image", @"imageOffset", @"bezel-inset", @"content-inset", @"bezel-color"]]; + forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]]; } - (id)initWithFrame:(CGRect)aFrame @@ -311,12 +311,12 @@ CPButtonImageOffset = 3.0; - (void)setImageOffset:(float)theImageOffset { - [self setValue:theImageOffset forThemeAttribute:@"imageOffset"]; + [self setValue:theImageOffset forThemeAttribute:@"image-offset"]; } - (float)imageOffset { - return [self valueForThemeAttribute:@"imageOffset"]; + return [self valueForThemeAttribute:@"image-offset"]; } - (void)setShowsStateBy:(CPInteger)aMask @@ -536,7 +536,7 @@ CPButtonImageOffset = 3.0; { [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title]; [contentView setImage:[self currentValueForThemeAttribute:@"image"]]; - [contentView setImageOffset:[self currentValueForThemeAttribute:@"imageOffset"]]; + [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]]; [contentView setFont:[self currentValueForThemeAttribute:@"font"]]; [contentView setTextColor:[self currentValueForThemeAttribute:@"text-color"]]; diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 9e6ca110f..d2a6169c3 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -413,7 +413,7 @@ var themedButtonValues = nil, [@"min-size", CGSizeMake(0.0, CPButtonDefaultHeight)], [@"max-size", CGSizeMake(-1.0, CPButtonDefaultHeight)], - [@"imageOffset", CPButtonImageOffset] + [@"image-offset", CPButtonImageOffset] ]; [self registerThemeValues:themedButtonValues forView:button]; @@ -821,7 +821,7 @@ var themedButtonValues = nil, [@"image", imageHighlighted, CPThemeStateHighlighted], [@"image", imageDisabled, CPThemeStateDisabled], [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], - [@"imageOffset", CPRadioImageOffset], + [@"image-offset", CPRadioImageOffset], [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], @@ -857,7 +857,7 @@ var themedButtonValues = nil, [@"image", imageHighlighted, CPThemeStateHighlighted], [@"image", imageDisabled, CPThemeStateDisabled], [@"image", imageSelectedDisabled, CPThemeStateSelected | CPThemeStateDisabled], - [@"imageOffset", CPCheckBoxImageOffset], + [@"image-offset", CPCheckBoxImageOffset], [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], @@ -886,7 +886,7 @@ var themedButtonValues = nil, [@"image", mixedImage, CPButtonStateMixed], [@"image", mixedHighlightedImage, CPButtonStateMixed | CPThemeStateHighlighted], [@"image", mixedDisabledImage, CPButtonStateMixed | CPThemeStateDisabled], - [@"imageOffset", CPCheckBoxImageOffset, CPButtonStateMixed], + [@"image-offset", CPCheckBoxImageOffset, CPButtonStateMixed], [@"max-size", CGSizeMake(-1.0, -1.0)] ];