mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-08-25 13:07:02 +00:00
Aparajita Fishman
afd5925499
Previously, Cappuccino was using preprocessor macros internally for the CGPoint/Size/Rect/Inset/Affine functions, as well as for CPRange. These macros had the same name as the corresponding function, but began with _. The functions were actually defined using the macros.
The motivation behind using macros was to increase performance by reducing function calls. However, there were a number of problems with this approach:
- There was an artificial dichotomy between _CG macros and the corresponding CG functions. We never completely replaced CG function calls with _CG macros. In fact, they were often mixed up in the same file. There was an extra burden on the programmer to remember to use the macro instead of the function.
- If a method call was passed as an argument to a macro, performance could actually be significantly *worse* than a function call. For example, _CGGetRectMakeCopy([view frame]) would expand to `{ origin:{ x:[view frame].origin.x, y:[view frame].origin.y }, size:{ width:[view frame].size.width, height:[view frame].size.height } }`. So instead of a single objj_msgSend and a single simple function call, we ended up with 4 objj_msgSend calls, which are way more expensive than simple function calls.
- Because of this expansion problem, to use macros efficiently required us to remember to use variables for all macro parameters. This didn't happen, and shouldn't have to happen.
- Finally, with modern Javascript engines, function call overhead is so small that it really isn't worth using the macros.
This commit eliminates the _CGGeometry, CGAffineTransformation and CPRange macros and replaces them with function calls.
BREAKING CHANGE:
The macros are no longer available. They could only be used with compiled code, but if there is any user code that used them, they will have to be replaced with the corresponding functions.
130 lines
3.8 KiB
Plaintext
130 lines
3.8 KiB
Plaintext
/*
|
|
* _CPTitleableWindowView.j
|
|
* AppKit
|
|
*
|
|
* Created by Alexander Ljungberg.
|
|
* Copyright 2012, SlevenBits Ltd.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
@import "CPTextField.j"
|
|
@import "_CPWindowView.j"
|
|
|
|
|
|
@implementation _CPTitleableWindowView : _CPWindowView
|
|
{
|
|
CPTextField _titleField;
|
|
}
|
|
|
|
+ (int)titleBarHeight
|
|
{
|
|
return [[CPTheme defaultTheme] valueForAttributeWithName:@"title-bar-height" forClass:[self class]];
|
|
}
|
|
|
|
+ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
|
|
{
|
|
var contentRect = [super contentRectForFrameRect:aFrameRect],
|
|
titleBarHeight = [self titleBarHeight];
|
|
|
|
contentRect.origin.y += titleBarHeight;
|
|
contentRect.size.height -= titleBarHeight;
|
|
|
|
return contentRect;
|
|
}
|
|
|
|
+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
|
|
{
|
|
var frameRect = CGRectMakeCopy(aContentRect),
|
|
titleBarHeight = [self titleBarHeight];
|
|
|
|
frameRect.origin.y -= titleBarHeight;
|
|
frameRect.size.height += titleBarHeight;
|
|
|
|
return frameRect;
|
|
}
|
|
|
|
- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
|
|
{
|
|
self = [super initWithFrame:aFrame styleMask:aStyleMask];
|
|
|
|
if (self)
|
|
{
|
|
_titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
|
|
|
|
[_titleField setHitTests:NO];
|
|
[_titleField setStringValue:@"Untitled"];
|
|
[_titleField sizeToFit];
|
|
[_titleField setAutoresizingMask:CPViewWidthSizable];
|
|
[_titleField setStringValue:@""];
|
|
|
|
[_titleField setFrame:CGRectMake(20.0, 3.0, CGRectGetWidth([self bounds]) - 40.0, CGRectGetHeight([_titleField frame]))];
|
|
|
|
[self addSubview:_titleField];
|
|
|
|
[self setNeedsLayout];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)setTitle:(CPString)aTitle
|
|
{
|
|
[_titleField setStringValue:aTitle];
|
|
}
|
|
|
|
- (void)tile
|
|
{
|
|
[super tile];
|
|
|
|
var theWindow = [self window],
|
|
bounds = [self bounds],
|
|
width = CGRectGetWidth(bounds);
|
|
|
|
// The vertical alignment of the title is set by the theme, so just give it all available space. By default
|
|
// the title will vertically centre within.
|
|
[_titleField setFrame:CGRectMake(20.0, 0, width - 40.0, [[self class] titleBarHeight])];
|
|
}
|
|
|
|
- (void)layoutSubviews
|
|
{
|
|
[super layoutSubviews];
|
|
|
|
[self setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];
|
|
|
|
[_titleField setTextColor:[self currentValueForThemeAttribute:@"title-text-color"]];
|
|
[_titleField setFont:[self currentValueForThemeAttribute:@"title-font"]];
|
|
[_titleField setAlignment:[self currentValueForThemeAttribute:@"title-alignment"]];
|
|
[_titleField setVerticalAlignment:[self currentValueForThemeAttribute:@"title-vertical-alignment"]];
|
|
[_titleField setLineBreakMode:[self currentValueForThemeAttribute:@"title-line-break-mode"]];
|
|
[_titleField setTextShadowColor:[self currentValueForThemeAttribute:@"title-text-shadow-color"]];
|
|
[_titleField setTextShadowOffset:[self currentValueForThemeAttribute:@"title-text-shadow-offset"]];
|
|
}
|
|
|
|
- (CGSize)_minimumResizeSize
|
|
{
|
|
var size = [super _minimumResizeSize];
|
|
|
|
size.height += [[self class] titleBarHeight];
|
|
return size;
|
|
}
|
|
|
|
- (int)bodyOffset
|
|
{
|
|
return [self contentRectForFrameRect:[self frame]].origin.y;
|
|
}
|
|
|
|
@end
|