diff options
author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 20:25:59 +0000 |
---|---|---|
committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-27 20:25:59 +0000 |
commit | 987d3f969bde97b121b4144a980394ee777663b7 (patch) | |
tree | 53943f2ffd567ecc615121b5714abd7ef9169edd /chrome/browser/cocoa/find_bar_view.mm | |
parent | ae23c272faf85d4cf779ae15d28fc59f5a8162ab (diff) | |
download | chromium_src-987d3f969bde97b121b4144a980394ee777663b7.zip chromium_src-987d3f969bde97b121b4144a980394ee777663b7.tar.gz chromium_src-987d3f969bde97b121b4144a980394ee777663b7.tar.bz2 |
Pretties up the FindBar on Mac.
BUG=http://crbug.com/14903
BUG=http://crbug.com/14904
BUG=http://crbug.com/14905
TEST=Findbar should function normally, as before.
Review URL: http://codereview.chromium.org/160144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/find_bar_view.mm')
-rw-r--r-- | chrome/browser/cocoa/find_bar_view.mm | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/chrome/browser/cocoa/find_bar_view.mm b/chrome/browser/cocoa/find_bar_view.mm index 8c73f4e..238884d 100644 --- a/chrome/browser/cocoa/find_bar_view.mm +++ b/chrome/browser/cocoa/find_bar_view.mm @@ -14,20 +14,37 @@ NSPoint topLeft = NSMakePoint(NSMinX(rect), NSMaxY(rect)); NSPoint topRight = NSMakePoint(NSMaxX(rect), NSMaxY(rect)); - // Inset the bottom points by 1 so we draw the border entirely - // inside the frame. - NSPoint bottomLeft = NSMakePoint(NSMinX(rect) + curveSize, NSMinY(rect) + 1); - NSPoint bottomRight = NSMakePoint(NSMaxX(rect) - curveSize, NSMinY(rect) + 1); + NSPoint midLeft1 = + NSMakePoint(NSMinX(rect) + curveSize, NSMaxY(rect) - curveSize); + NSPoint midLeft2 = + NSMakePoint(NSMinX(rect) + curveSize, NSMinY(rect) + curveSize); + NSPoint midRight1 = + NSMakePoint(NSMaxX(rect) - curveSize, NSMinY(rect) + curveSize); + NSPoint midRight2 = + NSMakePoint(NSMaxX(rect) - curveSize, NSMaxY(rect) - curveSize); + NSPoint bottomLeft = + NSMakePoint(NSMinX(rect) + (2 * curveSize), NSMinY(rect)); + NSPoint bottomRight = + NSMakePoint(NSMaxX(rect) - (2 * curveSize), NSMinY(rect)); NSBezierPath *path = [NSBezierPath bezierPath]; [path moveToPoint:topLeft]; + [path curveToPoint:midLeft1 + controlPoint1:NSMakePoint(midLeft1.x, topLeft.y) + controlPoint2:NSMakePoint(midLeft1.x, topLeft.y)]; + [path lineToPoint:midLeft2]; [path curveToPoint:bottomLeft - controlPoint1:NSMakePoint(topLeft.x + curveSize, topLeft.y) - controlPoint2:NSMakePoint(bottomLeft.x - curveSize, bottomLeft.y)]; + controlPoint1:NSMakePoint(midLeft2.x, bottomLeft.y) + controlPoint2:NSMakePoint(midLeft2.x, bottomLeft.y)]; + [path lineToPoint:bottomRight]; + [path curveToPoint:midRight1 + controlPoint1:NSMakePoint(midRight1.x, bottomLeft.y) + controlPoint2:NSMakePoint(midRight1.x, bottomLeft.y)]; + [path lineToPoint:midRight2]; [path curveToPoint:topRight - controlPoint1:NSMakePoint(bottomRight.x + curveSize, bottomRight.y) - controlPoint2:NSMakePoint(topRight.x - curveSize, topRight.y)]; + controlPoint1:NSMakePoint(midRight2.x, topLeft.y) + controlPoint2:NSMakePoint(midRight2.x, topLeft.y)]; [NSGraphicsContext saveGraphicsState]; [path addClip]; |