summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/ui/cocoa/hover_close_button.mm4
-rw-r--r--third_party/molokocacao/NSBezierPath+MCAdditions.h2
-rw-r--r--third_party/molokocacao/NSBezierPath+MCAdditions.m4
-rw-r--r--third_party/molokocacao/README.chromium1
4 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm
index 43bbc5c..e61409a 100644
--- a/chrome/browser/ui/cocoa/hover_close_button.mm
+++ b/chrome/browser/ui/cocoa/hover_close_button.mm
@@ -315,8 +315,8 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue";
kXShadowCircleAlpha : kXShadowAlpha;
[shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.15 alpha:alpha]];
[shadow setShadowOffset:NSMakeSize(0.0, 0.0)];
- [shadow setShadowBlurRadius:2.75 * scale];
- [xPath fillWithInnerShadow:shadow scale:scale];
+ [shadow setShadowBlurRadius:2.5];
+ [xPath fillWithInnerShadow:shadow];
return imageRep;
}
diff --git a/third_party/molokocacao/NSBezierPath+MCAdditions.h b/third_party/molokocacao/NSBezierPath+MCAdditions.h
index eb64479..f56660f 100644
--- a/third_party/molokocacao/NSBezierPath+MCAdditions.h
+++ b/third_party/molokocacao/NSBezierPath+MCAdditions.h
@@ -16,7 +16,7 @@
- (NSBezierPath*)pathWithStrokeWidth:(CGFloat)strokeWidth;
-- (void)fillWithInnerShadow:(NSShadow *)shadow scale:(float)scale;
+- (void)fillWithInnerShadow:(NSShadow *)shadow;
- (void)drawBlurWithColor:(NSColor*)color radius:(CGFloat)radius;
- (void)strokeInside;
diff --git a/third_party/molokocacao/NSBezierPath+MCAdditions.m b/third_party/molokocacao/NSBezierPath+MCAdditions.m
index 250a3ba..3761f34 100644
--- a/third_party/molokocacao/NSBezierPath+MCAdditions.m
+++ b/third_party/molokocacao/NSBezierPath+MCAdditions.m
@@ -92,7 +92,7 @@ static void CGPathCallback(void *info, const CGPathElement *element)
#endif // MCBEZIER_USE_PRIVATE_FUNCTION
}
-- (void)fillWithInnerShadow:(NSShadow *)shadow scale:(float)scale
+- (void)fillWithInnerShadow:(NSShadow *)shadow
{
[NSGraphicsContext saveGraphicsState];
@@ -102,7 +102,7 @@ static void CGPathCallback(void *info, const CGPathElement *element)
NSRect bounds = NSInsetRect(self.bounds, -(ABS(offset.width) + radius), -(ABS(offset.height) + radius));
// The context's user transform isn't automatically applied to shadow offsets.
- offset.height += scale * bounds.size.height;
+ offset.height += bounds.size.height;
shadow.shadowOffset = offset;
NSAffineTransform *transform = [NSAffineTransform transform];
if ([[NSGraphicsContext currentContext] isFlipped])
diff --git a/third_party/molokocacao/README.chromium b/third_party/molokocacao/README.chromium
index 060b3cf..235c82a 100644
--- a/third_party/molokocacao/README.chromium
+++ b/third_party/molokocacao/README.chromium
@@ -13,4 +13,3 @@ shadows on paths, for example).
Local Modifications:
- Added LICENSE file based on email correspondence with Sean.
- Added header guards.
- - Added a "scale:" parameter to fillWithInnerShadow:.