Skip to content

Commit

Permalink
Changed _CPImageAndTitleView to _CPImageAndTextView.
Browse files Browse the repository at this point in the history 
Reviewed by me.
  • Loading branch information
Francisco Ryan Tolmasky I committed Jan 24, 2009
1 parent 6acb074 commit 9e92667
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 70 deletions.
38 changes: 19 additions & 19 deletions AppKit/CPButton.j
View file
Expand Up @@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

@import "_CPImageAndTitleView.j"
@import "_CPImageAndTextView.j"
@import "CGGeometry.j"

@import "CPControl.j"
Expand Down Expand Up @@ -248,7 +248,7 @@ var _CPButtonClassName = nil,

BOOL _bezelBorderNeedsUpdate;

_CPImageAndTitleView _imageAndTitleView;
_CPImageAndTextView _imageAndTextView;
}

/*!
Expand Down Expand Up @@ -543,20 +543,20 @@ var _CPButtonClassName = nil,
else if (_bezelStyle == CPTexturedRoundedBezelStyle)
imageAndTitleSize.height -= 2.0;

[_imageAndTitleView setFrameSize:imageAndTitleSize];
[_imageAndTextView setFrameSize:imageAndTitleSize];
}
else
[_imageAndTitleView setFrameSize:size];
[_imageAndTextView setFrameSize:size];
}

/*!
Compacts the button's frame to fit its contents.
*/
- (void)sizeToFit
{
[_imageAndTitleView sizeToFit];
[_imageAndTextView sizeToFit];

var frame = [_imageAndTitleView frame],
var frame = [_imageAndTextView frame],
height = CGRectGetHeight(frame);
/*
if (_isBordered)
Expand Down Expand Up @@ -755,26 +755,26 @@ var _CPButtonClassName = nil,
/* @ignore */
- (void)drawContentsWithHighlight:(BOOL)isHighlighted
{
if (!_title && !_image && !_alternateTitle && !_alternateImage && !_imageAndTitleView)
if (!_title && !_image && !_alternateTitle && !_alternateImage && !_imageAndTextView)
return;

if (!_imageAndTitleView)
if (!_imageAndTextView)
{
_imageAndTitleView = [[_CPImageAndTitleView alloc] initWithFrame:[self bounds]];
_imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:[self bounds]];

[self addSubview:_imageAndTitleView];
[self addSubview:_imageAndTextView];

[self tile];
}

[_imageAndTitleView setFont:[self font]];
[_imageAndTitleView setTextColor:[self textColor]];
[_imageAndTitleView setAlignment:[self alignment]];
[_imageAndTitleView setImagePosition:_imagePosition];
[_imageAndTitleView setImageScaling:_imageScaling];
[_imageAndTextView setFont:[self font]];
[_imageAndTextView setTextColor:[self textColor]];
[_imageAndTextView setAlignment:[self alignment]];
[_imageAndTextView setImagePosition:_imagePosition];
[_imageAndTextView setImageScaling:_imageScaling];

[_imageAndTitleView setTitle:isHighlighted && _alternateTitle ? _alternateTitle : _title];
[_imageAndTitleView setImage:isHighlighted && _alternateImage ? _alternateImage : _image];
[_imageAndTextView setTitle:isHighlighted && _alternateTitle ? _alternateTitle : _title];
[_imageAndTextView setImage:isHighlighted && _alternateImage ? _alternateImage : _image];
}

- (void)viewDidMoveToWindow
Expand Down Expand Up @@ -842,12 +842,12 @@ var CPButtonImageKey = @"CPButtonImageKey",
*/
- (void)encodeWithCoder:(CPCoder)aCoder
{
// We do this in order to avoid encoding the _imageAndTitleView, which
// We do this in order to avoid encoding the _imageAndTextView, which
// should just automatically be created programmatically as needed.
var actualSubviews = _subviews;

_subviews = [_subviews copy];
[_subviews removeObjectIdenticalTo:_imageAndTitleView];
[_subviews removeObjectIdenticalTo:_imageAndTextView];

[super encodeWithCoder:aCoder];

Expand Down
40 changes: 20 additions & 20 deletions AppKit/CPMenuItem.j
View file
Expand Up @@ -867,7 +867,7 @@ var _CPMenuItemSelectionColor = nil,
BOOL _belongsToMenuBar;

CPImageView _stateView;
_CPImageAndTitleView _imageAndTitleView;
_CPImageAndTextView _imageAndTextView;
CPView _submenuView;
}

Expand Down Expand Up @@ -948,8 +948,8 @@ var _CPMenuItemSelectionColor = nil,

if (view)
{
[_imageAndTitleView removeFromSuperview];
_imageAndTitleView = nil;
[_imageAndTextView removeFromSuperview];
_imageAndTextView = nil;

[_stateView removeFromSuperview];
_stateView = nil;
Expand Down Expand Up @@ -1003,29 +1003,29 @@ var _CPMenuItemSelectionColor = nil,

// Image and Title

if (!_imageAndTitleView)
if (!_imageAndTextView)
{
_imageAndTitleView = [[_CPImageAndTitleView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
_imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];

[_imageAndTitleView setImagePosition:CPImageLeft];
[_imageAndTextView setImagePosition:CPImageLeft];

[self addSubview:_imageAndTitleView];
[self addSubview:_imageAndTextView];
}

var font = [_menuItem font];

if (!font)
font = _font;

[_imageAndTitleView setFont:font];
[_imageAndTitleView setImage:[_menuItem image]];
[_imageAndTitleView setTitle:[_menuItem title]];
[_imageAndTitleView setTextColor:[self textColor]];
[_imageAndTitleView setFrameOrigin:CGPointMake(x, 0.0)];
[_imageAndTextView setFont:font];
[_imageAndTextView setImage:[_menuItem image]];
[_imageAndTextView setTitle:[_menuItem title]];
[_imageAndTextView setTextColor:[self textColor]];
[_imageAndTextView setFrameOrigin:CGPointMake(x, 0.0)];

[_imageAndTitleView sizeToFit];
[_imageAndTextView sizeToFit];

var frame = [_imageAndTitleView frame];
var frame = [_imageAndTextView frame];

x += CGRectGetWidth(frame);

Expand Down Expand Up @@ -1076,11 +1076,11 @@ var _CPMenuItemSelectionColor = nil,
// ASSERT(![_menuItem view]);

if (_belongsToMenuBar)
[_imageAndTitleView setImage:shouldHighlight ? [_menuItem alternateImage] : [_menuItem image]];
[_imageAndTextView setImage:shouldHighlight ? [_menuItem alternateImage] : [_menuItem image]];

else if([_menuItem isEnabled])
{
[_imageAndTitleView setTextColor:shouldHighlight ? [CPColor whiteColor] : [self textColor]];
[_imageAndTextView setTextColor:shouldHighlight ? [CPColor whiteColor] : [self textColor]];

if (shouldHighlight)
[self setBackgroundColor:_CPMenuItemSelectionColor];
Expand All @@ -1103,16 +1103,16 @@ var _CPMenuItemSelectionColor = nil,

- (void)activate:(BOOL)shouldActivate
{
[_imageAndTitleView setImage:[_menuItem image]];
[_imageAndTextView setImage:[_menuItem image]];

if (shouldActivate)
{
[_imageAndTitleView setTextColor:[CPColor whiteColor]];
[_imageAndTextView setTextColor:[CPColor whiteColor]];
[_submenuView setColor:[CPColor whiteColor]];
}
else
{
[_imageAndTitleView setTextColor:[self textColor]];
[_imageAndTextView setTextColor:[self textColor]];
[_submenuView setColor:[self textColor]];
}
}
Expand Down Expand Up @@ -1152,7 +1152,7 @@ var _CPMenuItemSelectionColor = nil,

_textColor = aColor;

[_imageAndTitleView setTextColor:[self textColor]];
[_imageAndTextView setTextColor:[self textColor]];
[_submenuView setColor:[self textColor]];
}

Expand Down
62 changes: 31 additions & 31 deletions AppKit/_CPImageAndTitleView.j → AppKit/_CPImageAndTextView.j
View file
@@ -1,5 +1,5 @@
/*
* _CPImageAndTitleView.j
* _CPImageAndTextView.j
* AppKit
*
* Created by Francisco Tolmasky.
Expand Down Expand Up @@ -33,11 +33,11 @@
#include "Platform/Platform.h"
#include "Platform/DOM/CPDOMDisplayServer.h"

var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
_CPImageAndTitleViewImageChangedFlag = 1 << 1;
var _CPImageAndTextViewTextChangedFlag = 1 << 0,
_CPImageAndTextViewImageChangedFlag = 1 << 1;

/* @ignore */
@implementation _CPImageAndTitleView : CPView
@implementation _CPImageAndTextView : CPView
{
CPTextAlignment _alignment;
CPColor _textColor;
Expand All @@ -47,9 +47,9 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
CPImageScaling _imageScaling;

CPImage _image;
CPString _title;
CPString _text;

CGRect _titleSize;
CGRect _textSize;

unsigned _flags;

Expand All @@ -72,7 +72,7 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,

_textColor = nil;

_titleSize = NULL;
_textSize = NULL;
}

return self;
Expand Down Expand Up @@ -165,7 +165,7 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
_DOMElement.style.font = [_font ? _font : [CPFont systemFontOfSize:12.0] cssString];
#endif

_titleSize = NULL;
_textSize = NULL;

[self setNeedsDisplay:YES];
}
Expand All @@ -181,7 +181,7 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
return;

_image = anImage;
_flags |= _CPImageAndTitleViewImageChangedFlag;
_flags |= _CPImageAndTextViewImageChangedFlag;

[self setNeedsDisplay:YES];
}
Expand All @@ -193,26 +193,26 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,

- (void)setTitle:(CPString)aTitle
{
if (_title === aTitle)
if (_text === aTitle)
return;

_title = aTitle;
_flags |= _CPImageAndTitleViewTitleChangedFlag;
_text = aTitle;
_flags |= _CPImageAndTextViewTextChangedFlag;

_titleSize = NULL;
_textSize = NULL;

[self setNeedsDisplay:YES];
}

- (CPString)title
{
return _title;
return _text;
}

- (void)drawRect:(CGRect)aRect
{
#if PLATFORM(DOM)
var needsDOMTextElement = _imagePosition !== CPImageOnly && ([_title length] > 0);
var needsDOMTextElement = _imagePosition !== CPImageOnly && ([_text length] > 0);

// Create or destroy the DOM Text Element as necessary
if (needsDOMTextElement !== !!_DOMTextElement)
Expand All @@ -237,15 +237,15 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,

if (_DOMTextElement)
{
if (_flags & _CPImageAndTitleViewTitleChangedFlag)
if (_flags & _CPImageAndTextViewTextChangedFlag)
if (CPFeatureIsCompatible(CPJavascriptInnerTextFeature))
_DOMTextElement.innerText = _title;
_DOMTextElement.innerText = _text;

else if (CPFeatureIsCompatible(CPJavascriptTextContentFeature))
_DOMTextElement.textContent = _title;
_DOMTextElement.textContent = _text;

if (!_titleSize)
_titleSize = [_title sizeWithFont:_font];
if (!_textSize)
_textSize = [_text sizeWithFont:_font];
}

var needsDOMImageElement = _image !== nil;
Expand All @@ -271,7 +271,7 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
_DOMElement.appendChild(_DOMImageElement);
}

if (_DOMImageElement && (_flags & _CPImageAndTitleViewImageChangedFlag))
if (_DOMImageElement && (_flags & _CPImageAndTextViewImageChangedFlag))
_DOMImageElement.src = [_image filename];
#endif

Expand All @@ -280,7 +280,7 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
var size = [self bounds].size,
centerX = size.width / 2.0,
centerY = size.height / 2.0,
titleHeight = _DOMTextElement ? _titleSize.height : 0.0,
titleHeight = _DOMTextElement ? _textSize.height : 0.0,
titleRect = _CGRectMake(0.0, centerY - titleHeight / 2.0, size.width, titleHeight);

if ((_imagePosition !== CPNoImage) && _image)
Expand Down Expand Up @@ -377,25 +377,25 @@ var _CPImageAndTitleViewTitleChangedFlag = 1 << 0,
size.height += imageSize.height;
}

if (_imagePosition != CPImageOnly && [_title length] > 0)
if (_imagePosition != CPImageOnly && [_text length] > 0)
{
if (!_titleSize)
_titleSize = [_title sizeWithFont:_font];
if (!_textSize)
_textSize = [_text sizeWithFont:_font];

if (_imagePosition == CPImageLeft || _imagePosition == CPImageRight)
{
size.width += _titleSize.width;
size.height = MAX(size.height, _titleSize.height);
size.width += _textSize.width;
size.height = MAX(size.height, _textSize.height);
}
else if (_imagePosition == CPImageAbove || _imagePosition == CPImageBelow)
{
size.width = MAX(size.width, _titleSize.width);
size.height += _titleSize.height;
size.width = MAX(size.width, _textSize.width);
size.height += _textSize.height;
}
else // if (_imagePosition == CPImageOverlaps)
{
size.width = MAX(size.width, _titleSize.width);
size.height = MAX(size.height, _titleSize.height);
size.width = MAX(size.width, _textSize.width);
size.height = MAX(size.height, _textSize.height);
}
}

Expand Down

0 comments on commit 9e92667

Please sign in to comment.