mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-20 13:39:22 +00:00
several CPButton theming additions
- made image and alternate image a theme property - made image margins theme-able
This commit is contained in:
1 parent
64000215a4
commit
c9752195ac
3 files changed
+49
-38
No files matched your search
+22
-26
@@ -89,9 +89,6 @@ CPButtonStateMixed = CPThemeState("mixed");
|
||||
CPString _title;
|
||||
CPString _alternateTitle;
|
||||
|
||||
CPImage _image;
|
||||
CPImage _alternateImage;
|
||||
|
||||
CPInteger _showsStateBy;
|
||||
CPInteger _highlightsBy;
|
||||
BOOL _imageDimsWhenDisabled;
|
||||
@@ -127,8 +124,8 @@ CPButtonStateMixed = CPThemeState("mixed");
|
||||
|
||||
+ (id)themeAttributes
|
||||
{
|
||||
return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
|
||||
forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
|
||||
return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
|
||||
forKeys:[@"image", @"imageOffset", @"bezel-inset", @"content-inset", @"bezel-color"]];
|
||||
}
|
||||
|
||||
- (id)initWithFrame:(CGRect)aFrame
|
||||
@@ -284,18 +281,12 @@ CPButtonStateMixed = CPThemeState("mixed");
|
||||
|
||||
- (void)setImage:(CPImage)anImage
|
||||
{
|
||||
if (_image === anImage)
|
||||
return;
|
||||
|
||||
_image = anImage;
|
||||
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
[self setValue:anImage forThemeAttribute:@"image"];
|
||||
}
|
||||
|
||||
- (CPImage)image
|
||||
{
|
||||
return _image;
|
||||
return [self valueForThemeAttribute:@"image" inState:CPThemeStateNormal];
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -304,13 +295,7 @@ CPButtonStateMixed = CPThemeState("mixed");
|
||||
*/
|
||||
- (void)setAlternateImage:(CPImage)anImage
|
||||
{
|
||||
if (_alternateImage === anImage)
|
||||
return;
|
||||
|
||||
_alternateImage = anImage;
|
||||
|
||||
[self setNeedsLayout];
|
||||
[self setNeedsDisplay:YES];
|
||||
[self setValue:anImage forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -318,7 +303,17 @@ CPButtonStateMixed = CPThemeState("mixed");
|
||||
*/
|
||||
- (CPImage)alternateImage
|
||||
{
|
||||
return _alternateImage;
|
||||
return [self valueForThemeAttribute:@"image" inState:CPThemeStateHighlighted];
|
||||
}
|
||||
|
||||
- (void)setImageOffset:(float)theImageOffset
|
||||
{
|
||||
[self setValue:theImageOffset forThemeAttribute:@"imageOffset"];
|
||||
}
|
||||
|
||||
- (float)imageOffset
|
||||
{
|
||||
return [self valueForThemeAttribute:@"imageOffset"];
|
||||
}
|
||||
|
||||
- (void)setShowsStateBy:(CPInteger)aMask
|
||||
@@ -525,7 +520,8 @@ CPButtonStateMixed = CPThemeState("mixed");
|
||||
if (contentView)
|
||||
{
|
||||
[contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
|
||||
[contentView setImage:([self hasThemeState:CPThemeStateHighlighted] && _alternateImage) ? _alternateImage : _image];
|
||||
[contentView setImage:[self currentValueForThemeAttribute:@"image"]];
|
||||
[contentView setImageOffset:[self currentValueForThemeAttribute:@"imageOffset"]];
|
||||
|
||||
[contentView setFont:[self currentValueForThemeAttribute:@"font"]];
|
||||
[contentView setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
|
||||
@@ -664,8 +660,8 @@ var CPButtonImageKey = @"CPButtonImageKey",
|
||||
{
|
||||
_controlSize = CPRegularControlSize;
|
||||
|
||||
_image = [aCoder decodeObjectForKey:CPButtonImageKey];
|
||||
_alternateImage = [aCoder decodeObjectForKey:CPButtonAlternateImageKey];
|
||||
[self setImage:[aCoder decodeObjectForKey:CPButtonImageKey]];
|
||||
[self setAlternateImage:[aCoder decodeObjectForKey:CPButtonAlternateImageKey]];
|
||||
|
||||
_title = [aCoder decodeObjectForKey:CPButtonTitleKey];
|
||||
_alternateTitle = [aCoder decodeObjectForKey:CPButtonAlternateTitleKey];
|
||||
@@ -692,8 +688,8 @@ var CPButtonImageKey = @"CPButtonImageKey",
|
||||
{
|
||||
[super encodeWithCoder:aCoder];
|
||||
|
||||
[aCoder encodeObject:_image forKey:CPButtonImageKey];
|
||||
[aCoder encodeObject:_alternateImage forKey:CPButtonAlternateImageKey];
|
||||
[aCoder encodeObject:[self image] forKey:CPButtonImageKey];
|
||||
[aCoder encodeObject:[self alternateImage] forKey:CPButtonAlternateImageKey];
|
||||
|
||||
[aCoder encodeObject:_title forKey:CPButtonTitleKey];
|
||||
[aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];
|
||||
|
||||
@@ -410,7 +410,9 @@ var themedButtonValues = nil,
|
||||
[@"bezel-color", defaultHighlightedBezelColor, CPThemeStateBordered | CPThemeStateHighlighted | CPThemeStateDefault],
|
||||
|
||||
[@"min-size", CGSizeMake(0.0, 24.0)],
|
||||
[@"max-size", CGSizeMake(-1.0, 24.0)]
|
||||
[@"max-size", CGSizeMake(-1.0, 24.0)],
|
||||
|
||||
[@"imageOffset", 3.0]
|
||||
];
|
||||
|
||||
[self registerThemeValues:themedButtonValues forView:button];
|
||||
|
||||
@@ -45,9 +45,6 @@ var _CPimageAndTextViewFrameSizeChangedFlag = 1 << 0,
|
||||
_CPImageAndTextViewImagePositionChangedFlag = 1 << 9,
|
||||
_CPImageAndTextViewImageScalingChangedFlag = 1 << 10;
|
||||
|
||||
var HORIZONTAL_MARGIN = 3.0,
|
||||
VERTICAL_MARGIN = 5.0;
|
||||
|
||||
/* @ignore */
|
||||
@implementation _CPImageAndTextView : CPView
|
||||
{
|
||||
@@ -63,6 +60,7 @@ var HORIZONTAL_MARGIN = 3.0,
|
||||
|
||||
CPCellImagePosition _imagePosition;
|
||||
CPImageScaling _imageScaling;
|
||||
float _imageOffset;
|
||||
BOOL _shouldDimImage;
|
||||
|
||||
CPImage _image;
|
||||
@@ -97,6 +95,7 @@ var HORIZONTAL_MARGIN = 3.0,
|
||||
[self setFont:[aControl font]];
|
||||
[self setImagePosition:[aControl imagePosition]];
|
||||
[self setImageScaling:[aControl imageScaling]];
|
||||
[self setImageOffset:[aControl imageOffset]];
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -305,6 +304,20 @@ var HORIZONTAL_MARGIN = 3.0,
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
- (void)setImageOffset:(float)theImageOffset
|
||||
{
|
||||
if (_imageOffset === theImageOffset)
|
||||
return;
|
||||
|
||||
_imageOffset = theImageOffset;
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
- (float)imageOffset
|
||||
{
|
||||
return _imageOffset;
|
||||
}
|
||||
|
||||
- (void)imageDidLoad:(id)anImage
|
||||
{
|
||||
if (anImage === _image)
|
||||
@@ -599,29 +612,29 @@ var HORIZONTAL_MARGIN = 3.0,
|
||||
imageStyle.left = FLOOR(centerX - imageWidth / 2.0) + "px";
|
||||
imageStyle.top = FLOOR(size.height - imageHeight) + "px";
|
||||
|
||||
textRect.size.height = size.height - imageHeight - VERTICAL_MARGIN;
|
||||
textRect.size.height = size.height - imageHeight - _imageOffset;
|
||||
}
|
||||
else if (_imagePosition === CPImageAbove)
|
||||
{
|
||||
CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, FLOOR(centerX - imageWidth / 2.0), 0);
|
||||
|
||||
textRect.origin.y += imageHeight + VERTICAL_MARGIN;
|
||||
textRect.size.height = size.height - imageHeight - VERTICAL_MARGIN;
|
||||
textRect.origin.y += imageHeight + _imageOffset;
|
||||
textRect.size.height = size.height - imageHeight - _imageOffset;
|
||||
}
|
||||
else if (_imagePosition === CPImageLeft)
|
||||
{
|
||||
imageStyle.top = FLOOR(centerY - imageHeight / 2.0) + "px";
|
||||
imageStyle.left = "0px";
|
||||
|
||||
textRect.origin.x = imageWidth + HORIZONTAL_MARGIN;
|
||||
textRect.size.width -= imageWidth + HORIZONTAL_MARGIN;
|
||||
textRect.origin.x = imageWidth + _imageOffset;
|
||||
textRect.size.width -= imageWidth + _imageOffset;
|
||||
}
|
||||
else if (_imagePosition === CPImageRight)
|
||||
{
|
||||
imageStyle.top = FLOOR(centerY - imageHeight / 2.0) + "px";
|
||||
imageStyle.left = FLOOR(size.width - imageWidth) + "px";
|
||||
|
||||
textRect.size.width -= imageWidth + HORIZONTAL_MARGIN;
|
||||
textRect.size.width -= imageWidth + _imageOffset;
|
||||
}
|
||||
else if (_imagePosition === CPImageOnly)
|
||||
{
|
||||
@@ -701,13 +714,13 @@ var HORIZONTAL_MARGIN = 3.0,
|
||||
|
||||
if (_imagePosition === CPImageLeft || _imagePosition === CPImageRight)
|
||||
{
|
||||
size.width += _textSize.width + HORIZONTAL_MARGIN;
|
||||
size.width += _textSize.width + _imageOffset;
|
||||
size.height = MAX(size.height, _textSize.height);
|
||||
}
|
||||
else if (_imagePosition === CPImageAbove || _imagePosition === CPImageBelow)
|
||||
{
|
||||
size.width = MAX(size.width, _textSize.width);
|
||||
size.height += _textSize.height + VERTICAL_MARGIN;
|
||||
size.height += _textSize.height + _imageOffset;
|
||||
}
|
||||
else // if (_imagePosition == CPImageOverlaps)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user