Merge remote-tracking branch 'cappuccino/master'

This commit is contained in:
daniel committed 2018-04-07 11:34:21 -07:00
commit 90d04956e6
9 files changed
+10 -13

No files matched your search

+1 -1
View File
@@ -216,7 +216,7 @@ var CPApplicationDelegate_applicationShouldTerminate_ = 1 << 0,
}
if ([_delegate respondsToSelector:@selector(applicationShouldTerminate:)])
_implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminate_
_implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminate_;
if ([_delegate respondsToSelector:@selector(applicationShouldTerminateMessage:)])
_implementedDelegateMethods |= CPApplicationDelegate_applicationShouldTerminateMessage_
+1 -1
View File
@@ -563,7 +563,7 @@
*/
- (BOOL)setSelectionIndexes:(CPIndexSet)indexes
{
[self _selectionWillChange]
[self _selectionWillChange];
var r = [self __setSelectionIndexes:indexes avoidEmpty:NO];
[self _selectionDidChange];
return r;
+1 -1
View File
@@ -142,7 +142,7 @@ var RADIANS = Math.PI / 180;
if ([_datePicker _isAmericanFormat])
{
if (dateValue.getHours() > 11)
[_PMAMTextField setStringValue:@"PM"]
[_PMAMTextField setStringValue:@"PM"];
else
[_PMAMTextField setStringValue:@"AM"];
+1 -1
View File
@@ -857,7 +857,7 @@ var CPBindingOperationAnd = 0,
- (id)initWithName:(CPString)aName
{
if (self = [super init])
_name = aName
_name = aName;
return self;
}
+2 -2
View File
@@ -557,14 +557,14 @@ CGContextConcatCTM = function(aContext, anAffineTransform)
b = VT.b;
c = VT.c;
d = VT.d;
scale_rotate(a, b, c, d)
scale_rotate(a, b, c, d);
S.a *= sx;
S.d *= sy;
a = U.a;
b = U.b;
c = U.c;
d = U.d;
rotate_scale(a, b, c, d)
rotate_scale(a, b, c, d);
sx = S.a * sx;
sy = S.d * sy;
}
+1 -1
View File
@@ -242,7 +242,7 @@ function CGContextDrawPath(aContext, aMode)
vml.push("\">");
if (gState.gradient)
vml.push(gState.gradient)
vml.push(gState.gradient);
else if (fill)
{
+1 -4
View File
@@ -132,9 +132,6 @@ function CGPathAddArc(aPath, aTransform, x, y, aRadius, aStartAngle, anEndAngle,
}
else
{
var arcStartX = x + aRadius * COS(aStartAngle),
arcStartY = y + aRadius * SIN(aStartAngle);
aPath.start = CGPointMake(arcStartX, arcStartY);
}
@@ -274,7 +271,7 @@ function CGPathAddQuadCurveToPoint(aPath, aTransform, cpx, cpy, x, y)
end = CGPointApplyAffineTransform(end, aTransform);
}
aPath.elements[aPath.count++] = { type:kCGPathElementAddQuadCurveToPoint, cpx:cp.x, cpy:cp.y, x:end.x, y:end.y }
aPath.elements[aPath.count++] = { type:kCGPathElementAddQuadCurveToPoint, cpx:cp.x, cpy:cp.y, x:end.x, y:end.y };
aPath.current = end;
}
+1 -1
View File
@@ -574,7 +574,7 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4,
_isOpening = NO;
[_delegate _popoverWindowDidShow];
}
};
#if PLATFORM(DOM)
_DOMElement.addEventListener(CPBrowserStyleProperty('transitionend'), _transitionCompleteFunction, YES);
+1 -1
View File
@@ -181,7 +181,7 @@ var _CPToolTipHeight = 24.0,
textFrameSize.height += 4;
_content = [CPTextField labelWithTitle:aString];
[_content setFont:[CPFont systemFontOfSize:_CPToolTipFontSize]]
[_content setFont:[CPFont systemFontOfSize:_CPToolTipFontSize]];
[_content setLineBreakMode:CPLineBreakByCharWrapping];
[_content setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
[_content setFrameOrigin:CGPointMake(0.0, 0.0)];