summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/gradient_button_cell.mm
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 21:36:10 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 21:36:10 +0000
commitc47ee3fe8eb962680d1597bc1e63c666833f1a57 (patch)
treec6411a90be8806cd84f45edfbffe09a50056441d /chrome/browser/cocoa/gradient_button_cell.mm
parent56c4456f31726d89bcaba8471ff71e097066907d (diff)
downloadchromium_src-c47ee3fe8eb962680d1597bc1e63c666833f1a57.zip
chromium_src-c47ee3fe8eb962680d1597bc1e63c666833f1a57.tar.gz
chromium_src-c47ee3fe8eb962680d1597bc1e63c666833f1a57.tar.bz2
Mac: fix/implement app windows (not app mode), popups, drawing; refactor code.
1. Properly display app windows, including Developer Tools window (no location bar). Also check using --app=http://foobar.com/. 2. Lay out popup windows (in particular, location bar) better. Check using, e.g., <http://www.quirksmode.org/js/popup.html>; make sure it looks good (with a variety of themes). 3. Properly draw border to Omnibox -- so that its border matches the surrounding buttons. Check (looking very closely/zooming) using various themes (Google and artist, light and dark). 4. Re-organize/refactor code in the BrowserWindowController (esp. the layout code). Check that (in a normal window) it still displays the toolbar, bookmark bar (normal and NTP), infobar, and download shelf correctly. BUG=13148,20244,26757,29103 TEST=See above. Review URL: http://codereview.chromium.org/495010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/gradient_button_cell.mm')
-rw-r--r--chrome/browser/cocoa/gradient_button_cell.mm14
1 files changed, 0 insertions, 14 deletions
diff --git a/chrome/browser/cocoa/gradient_button_cell.mm b/chrome/browser/cocoa/gradient_button_cell.mm
index 838397c8..43b865f 100644
--- a/chrome/browser/cocoa/gradient_button_cell.mm
+++ b/chrome/browser/cocoa/gradient_button_cell.mm
@@ -24,7 +24,6 @@
inView:(NSView*)controlView
innerFrame:(NSRect*)returnInnerFrame
innerPath:(NSBezierPath**)returnInnerPath
- outerPath:(NSBezierPath**)returnOuterPath
clipPath:(NSBezierPath**)returnClipPath;
@end
@@ -176,7 +175,6 @@ static const NSTimeInterval kAnimationHideDuration = 0.4;
// TODO(viettrungluu): clean up/reorganize.
- (void)drawBorderAndFillForTheme:(GTMTheme*)theme
controlView:(NSView*)controlView
- outerPath:(NSBezierPath*)outerPath
innerPath:(NSBezierPath*)innerPath
showClickedGradient:(BOOL)showClickedGradient
showHighlightGradient:(BOOL)showHighlightGradient
@@ -279,7 +277,6 @@ static const NSTimeInterval kAnimationHideDuration = 0.4;
inView:(NSView*)controlView
innerFrame:(NSRect*)returnInnerFrame
innerPath:(NSBezierPath**)returnInnerPath
- outerPath:(NSBezierPath**)returnOuterPath
clipPath:(NSBezierPath**)returnClipPath {
// Constants from Cole. Will kConstant them once the feedback loop
// is complete.
@@ -316,13 +313,6 @@ static const NSTimeInterval kAnimationHideDuration = 0.4;
xRadius:radius
yRadius:radius];
}
- if (returnOuterPath) {
- DCHECK(*returnOuterPath == nil);
- NSRect outerPathRect = NSInsetRect(drawFrame, -1, -1);
- *returnOuterPath = [NSBezierPath bezierPathWithRoundedRect:outerPathRect
- xRadius:radius + 1
- yRadius:radius + 1];
- }
if (returnClipPath) {
DCHECK(*returnClipPath == nil);
NSRect clipPathRect = NSInsetRect(drawFrame, -0.5, -0.5);
@@ -336,12 +326,10 @@ static const NSTimeInterval kAnimationHideDuration = 0.4;
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
NSRect innerFrame;
NSBezierPath* innerPath = nil;
- NSBezierPath* outerPath = nil;
[self getDrawParamsForFrame:cellFrame
inView:controlView
innerFrame:&innerFrame
innerPath:&innerPath
- outerPath:&outerPath
clipPath:NULL];
BOOL pressed = [self isHighlighted];
@@ -358,7 +346,6 @@ static const NSTimeInterval kAnimationHideDuration = 0.4;
[self drawBorderAndFillForTheme:theme
controlView:controlView
- outerPath:outerPath
innerPath:innerPath
showClickedGradient:pressed
showHighlightGradient:[self isHighlighted]
@@ -456,7 +443,6 @@ static const NSTimeInterval kAnimationHideDuration = 0.4;
inView:controlView
innerFrame:NULL
innerPath:NULL
- outerPath:NULL
clipPath:&boundingPath];
return boundingPath;
}