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.
407 lines
14 KiB
Plaintext
407 lines
14 KiB
Plaintext
/*
|
|
* _CPPopoverWindowView.j
|
|
* AppKit
|
|
*
|
|
* Created by Antoine Mercadal
|
|
* Copyright 2011 <primalmotion@archipelproject.org>
|
|
*
|
|
* 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 <Foundation/CPGeometry.j>
|
|
|
|
@import "CGGeometry.j"
|
|
@import "CGGradient.j"
|
|
@import "_CPWindowView.j"
|
|
|
|
@global CPPopoverAppearanceMinimal
|
|
|
|
var _CPPopoverWindowViewDefaultCursorSize = CGSizeMake(16, 10),
|
|
_CPPopoverWindowViewRadius = 5.0,
|
|
_CPPopoverWindowViewStrokeWidth = 1.0,
|
|
_CPPopoverWindowViewShadowSize = CGSizeMake(0, 6),
|
|
_CPPopoverWindowViewShadowBlur = 15.0;
|
|
|
|
/*!
|
|
@ignore
|
|
|
|
A custom CPWindowView that manages a border and cursor
|
|
*/
|
|
@implementation _CPPopoverWindowView : _CPWindowView
|
|
{
|
|
float _arrowOffsetX @accessors(property=arrowOffsetX);
|
|
float _arrowOffsetY @accessors(property=arrowOffsetY);
|
|
int _appearance @accessors(property=appearance);
|
|
unsigned _preferredEdge @accessors(property=preferredEdge);
|
|
|
|
CGSize _cursorSize;
|
|
}
|
|
|
|
+ (CPString)defaultThemeClass
|
|
{
|
|
return @"popover-window-view";
|
|
}
|
|
|
|
+ (id)themeAttributes
|
|
{
|
|
return @{
|
|
@"background-gradient": [CPNull null],
|
|
@"background-gradient-hud": [CPNull null],
|
|
@"stroke-color": [CPNull null],
|
|
@"stroke-color-hud": [CPNull null],
|
|
};
|
|
}
|
|
|
|
/*!
|
|
Compute the contentView frame from a given window frame
|
|
|
|
@param aFrameRect the window frame
|
|
*/
|
|
- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
|
|
{
|
|
var contentRect = CGRectMakeCopy(aFrameRect),
|
|
modifierX = 16,
|
|
modifierY = 19;
|
|
|
|
// @todo change border art and remove this pixel perfect adaptation
|
|
//
|
|
// @comment: If we use this, each time we open the popover, the content
|
|
// view is reduced a little over and over
|
|
// return CGRectInset(contentRect, modifierX, modifierY);
|
|
|
|
contentRect.origin.x += modifierX;
|
|
contentRect.origin.y += modifierY;
|
|
contentRect.size.width -= modifierX * 2;
|
|
contentRect.size.height -= modifierY * 2;
|
|
|
|
return contentRect;
|
|
}
|
|
|
|
/*!
|
|
Compute the window frame from a given contentView frame
|
|
|
|
@param aContentRect the contentView frame
|
|
*/
|
|
+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
|
|
{
|
|
var frameRect = CGRectMakeCopy(aContentRect),
|
|
modifierX = 16,
|
|
modifierY = 19;
|
|
|
|
// @todo change border art and remove this pixel perfect adaptation
|
|
// @comment: If we use this, each time we open the popover, the content
|
|
//
|
|
// view is reduced a little over and over
|
|
// return CGRectOffset(frameRect, modifierX, modifierY);
|
|
|
|
frameRect.origin.x -= modifierX;
|
|
frameRect.origin.y -= modifierY;
|
|
frameRect.size.width += modifierX * 2;
|
|
frameRect.size.height += modifierY * 2;
|
|
|
|
return frameRect;
|
|
}
|
|
|
|
/*!
|
|
Initialize the _CPWindowView
|
|
*/
|
|
- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
|
|
{
|
|
if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
|
|
{
|
|
_arrowOffsetX = 0.0;
|
|
_arrowOffsetY = 0.0;
|
|
_appearance = CPPopoverAppearanceMinimal;
|
|
_cursorSize = CGSizeMakeCopy(_CPPopoverWindowViewDefaultCursorSize);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
/*!
|
|
Hide the cursor
|
|
*/
|
|
- (void)hideCursor
|
|
{
|
|
_cursorSize = CGSizeMakeZero();
|
|
[self setNeedsDisplay:YES];
|
|
}
|
|
|
|
/*!
|
|
Show the cursor
|
|
*/
|
|
- (void)showCursor
|
|
{
|
|
_cursorSize = CGSizeMakeCopy(_CPPopoverWindowViewDefaultCursorSize);
|
|
[self setNeedsDisplay:YES];
|
|
}
|
|
|
|
/*!
|
|
Draw the view
|
|
*/
|
|
- (void)drawRect:(CGRect)aRect
|
|
{
|
|
[super drawRect:aRect];
|
|
|
|
var context = [[CPGraphicsContext currentContext] graphicsPort],
|
|
radius = _CPPopoverWindowViewRadius,
|
|
arrowWidth = _cursorSize.width,
|
|
arrowHeight = _cursorSize.height,
|
|
strokeWidth = _CPPopoverWindowViewStrokeWidth,
|
|
halfStrokeWidth = strokeWidth / 2.0,
|
|
strokeColor,
|
|
shadowColor = [[CPColor blackColor] colorWithAlphaComponent:.2],
|
|
shadowSize = _CPPopoverWindowViewShadowSize,
|
|
shadowBlur = _CPPopoverWindowViewShadowBlur,
|
|
gradient,
|
|
frame = [self bounds];
|
|
|
|
if (_appearance == CPPopoverAppearanceMinimal)
|
|
{
|
|
gradient = [self valueForThemeAttribute:@"background-gradient"];
|
|
strokeColor = [self valueForThemeAttribute:@"stroke-color"];
|
|
}
|
|
else
|
|
{
|
|
gradient = [self valueForThemeAttribute:@"background-gradient-hud"];
|
|
strokeColor = [self valueForThemeAttribute:@"stroke-color-hud"];
|
|
}
|
|
|
|
// fix rect to take care of stroke and shadow
|
|
frame.origin.x += halfStrokeWidth + shadowBlur;
|
|
frame.origin.y += halfStrokeWidth + (shadowBlur + shadowSize.height / 2);
|
|
frame.size.width -= strokeWidth + (shadowBlur * 2);
|
|
frame.size.height -= strokeWidth + (shadowBlur * 2 + shadowSize.height);
|
|
|
|
CGContextSetStrokeColor(context, strokeColor);
|
|
CGContextSetLineWidth(context, strokeWidth);
|
|
|
|
CGContextBeginPath(context);
|
|
CGContextSetShadowWithColor(context, shadowSize, shadowBlur, shadowColor);
|
|
CGContextDrawLinearGradient(context, gradient, CGPointMake(CGRectGetMidX(frame), 0.0), CGPointMake(CGRectGetMidX(frame), frame.size.height), 0);
|
|
|
|
var xMin = CGRectGetMinX(frame),
|
|
xMax = CGRectGetMaxX(frame),
|
|
yMin = CGRectGetMinY(frame),
|
|
yMax = CGRectGetMaxY(frame),
|
|
arrowMinX = CGAlignCoordinate(xMin + radius + strokeWidth),
|
|
arrowMaxX = CGAlignCoordinate(xMax - radius - strokeWidth),
|
|
arrowMinY = CGAlignCoordinate(yMin + radius + strokeWidth),
|
|
arrowMaxY = CGAlignCoordinate(yMax - radius + strokeWidth),
|
|
arrowAnchor = CGPointMakeZero(),
|
|
arrowStart = CGPointMakeZero(),
|
|
pt = CGPointMakeZero();
|
|
|
|
// draw!
|
|
var path = CGPathCreateMutable();
|
|
|
|
switch (_preferredEdge)
|
|
{
|
|
case CPMinXEdge:
|
|
case CPMaxXEdge:
|
|
// origin nw
|
|
pt.x = CGAlignCoordinate(xMin + radius);
|
|
pt.y = yMin;
|
|
CGPathMoveToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// ne
|
|
pt.x = CGAlignCoordinate(xMax - radius);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, xMax, yMin, xMax, CGAlignCoordinate(yMin + radius));
|
|
|
|
if (_preferredEdge === CPMinXEdge)
|
|
{
|
|
// arrow CPMinXEdge
|
|
arrowAnchor.x = CGAlignStroke(xMax, strokeWidth);
|
|
arrowAnchor.y = CGAlignCoordinate((frame.size.height / 2) + yMin + _arrowOffsetY);
|
|
|
|
// to top edge
|
|
pt.y = CGAlignCoordinate(arrowAnchor.y - (arrowWidth / 2));
|
|
|
|
// adjust starting point to not go beyond the corner
|
|
if (pt.y <= arrowMinY)
|
|
pt.y = arrowMinY;
|
|
else if ((pt.y + arrowWidth) > arrowMaxY)
|
|
pt.y = arrowMaxY - arrowWidth;
|
|
|
|
pt.x = arrowAnchor.x;
|
|
arrowStart = CGPointMakeCopy(pt);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// top edge -> point
|
|
pt.x = CGAlignStroke(arrowAnchor.x + arrowHeight, strokeWidth);
|
|
pt.y = arrowAnchor.y;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// point -> bottom edge
|
|
pt.x = arrowAnchor.x;
|
|
pt.y = CGAlignCoordinate(arrowStart.y + arrowWidth);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
}
|
|
|
|
// se
|
|
pt.x = xMax;
|
|
pt.y = CGAlignCoordinate(yMax - radius);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, pt.x, yMax, CGAlignCoordinate(xMax - radius), yMax);
|
|
|
|
// sw
|
|
pt.x = CGAlignCoordinate(xMin + radius);
|
|
pt.y = yMax;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, xMin, pt.y, xMin, CGAlignCoordinate(yMax - radius));
|
|
|
|
if (_preferredEdge === CPMaxXEdge)
|
|
{
|
|
// arrow CPMaxXEdge
|
|
arrowAnchor.x = CGAlignStroke(xMin, strokeWidth);
|
|
arrowAnchor.y = CGAlignCoordinate((frame.size.height / 2) + yMin + _arrowOffsetY);
|
|
|
|
// to bottom edge
|
|
pt.y = CGAlignCoordinate(arrowAnchor.y + (arrowWidth / 2));
|
|
|
|
// adjust starting point to not go beyond the corner
|
|
if ((pt.y - arrowWidth) < arrowMinY)
|
|
pt.y = arrowMinY + arrowWidth;
|
|
else if (pt.y > arrowMaxY)
|
|
pt.y = arrowMaxY;
|
|
|
|
pt.x = arrowAnchor.x;
|
|
arrowStart = CGPointMakeCopy(pt);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// bottom edge -> point
|
|
pt.x = CGAlignStroke(arrowAnchor.x - arrowHeight, strokeWidth);
|
|
pt.y = arrowAnchor.y;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// point -> top edge
|
|
pt.x = arrowAnchor.x;
|
|
pt.y = CGAlignCoordinate(arrowStart.y - arrowWidth);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
}
|
|
|
|
// nw
|
|
pt.x = xMin;
|
|
pt.y = CGAlignCoordinate(yMin + radius);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, pt.x, yMin, CGAlignCoordinate(xMin + radius), yMin);
|
|
break;
|
|
|
|
case CPMaxYEdge:
|
|
case CPMinYEdge:
|
|
// origin sw
|
|
pt.x = xMin;
|
|
pt.y = CGAlignCoordinate(yMax - radius);
|
|
CGPathMoveToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// nw
|
|
pt.y = CGAlignCoordinate(yMin + radius);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, pt.x, yMin, CGAlignCoordinate(xMin + radius), yMin);
|
|
|
|
if (_preferredEdge === CPMaxYEdge)
|
|
{
|
|
// arrow CPMaxYEdge
|
|
arrowAnchor.x = CGAlignCoordinate((frame.size.width / 2) + xMin + _arrowOffsetX);
|
|
arrowAnchor.y = CGAlignStroke(yMin + _arrowOffsetY, strokeWidth);
|
|
|
|
// to left edge
|
|
pt.x = CGAlignCoordinate(arrowAnchor.x - (arrowWidth / 2));
|
|
|
|
// adjust starting point to not go beyond the corner
|
|
if (pt.x < arrowMinX)
|
|
pt.x = arrowMinX;
|
|
else if ((pt.x + arrowWidth) > arrowMaxX)
|
|
pt.x = arrowMaxX - arrowWidth;
|
|
|
|
pt.y = arrowAnchor.y;
|
|
arrowStart = CGPointMakeCopy(pt);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// left edge -> point
|
|
pt.x = arrowAnchor.x;
|
|
pt.y = CGAlignStroke(arrowAnchor.y - arrowHeight, strokeWidth);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// point -> right edge
|
|
pt.x = CGAlignCoordinate(arrowStart.x + arrowWidth);
|
|
pt.y = arrowAnchor.y;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
}
|
|
|
|
// ne
|
|
pt.x = CGAlignCoordinate(xMax - radius);
|
|
pt.y = yMin;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, xMax, pt.y, xMax, CGAlignCoordinate(yMin + radius));
|
|
|
|
// se
|
|
pt.x = xMax;
|
|
pt.y = CGAlignCoordinate(yMax - radius);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, pt.x, yMax, CGAlignCoordinate(xMax - radius), yMax);
|
|
|
|
if (_preferredEdge === CPMinYEdge)
|
|
{
|
|
// arrow CPMinYEdge
|
|
arrowAnchor.x = CGAlignCoordinate((frame.size.width / 2) + xMin + _arrowOffsetX);
|
|
arrowAnchor.y = CGAlignStroke(yMax + _arrowOffsetY, strokeWidth);
|
|
|
|
// to right edge
|
|
pt.x = CGAlignCoordinate(arrowAnchor.x + (arrowWidth / 2));
|
|
|
|
// adjust starting point to not go beyond the corner
|
|
if ((pt.x - arrowWidth) < arrowMinX)
|
|
pt.x = arrowMinX + arrowWidth;
|
|
else if (pt.x > arrowMaxX)
|
|
pt.x = arrowMaxX;
|
|
|
|
pt.y = arrowAnchor.y;
|
|
arrowStart = CGPointMakeCopy(pt);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// right edge -> point
|
|
pt.x = arrowAnchor.x;
|
|
pt.y = CGAlignStroke(arrowAnchor.y + arrowHeight, strokeWidth);
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
|
|
// point -> left edge
|
|
pt.x = CGAlignCoordinate(arrowStart.x - arrowWidth);
|
|
pt.y = arrowAnchor.y;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
}
|
|
|
|
// sw
|
|
pt.x = CGAlignCoordinate(xMin + radius);
|
|
pt.y = yMax;
|
|
CGPathAddLineToPoint(path, NULL, pt.x, pt.y);
|
|
CGPathAddCurveToPoint(path, NULL, pt.x, pt.y, xMin, pt.y, xMin, CGAlignCoordinate(yMax - radius));
|
|
break;
|
|
|
|
default:
|
|
// no computed edge means standard rounded rect
|
|
CGPathAddPath(path, NULL, CGPathWithRoundedRectangleInRect(frame, radius, radius, YES, YES, YES, YES));
|
|
}
|
|
|
|
CGContextAddPath(context, path);
|
|
CGContextStrokePath(context);
|
|
|
|
CGContextAddPath(context, path);
|
|
CGContextFillPath(context);
|
|
}
|
|
|
|
@end
|