More bookmark bar changes....

chrome/browser/cocoa/gradient_button_cell.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/cocoa/gradient_button_cell.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 #import "base/scoped_nsobject.h"
 
 @implementation GradientButtonCell
 
+- (id)initTextCell:(NSString*)string {
+  if ((self = [super initTextCell:string])) {
+    shouldTheme_ = YES;
+  }
+  return self;
+}
+
+- (void)setShouldTheme:(BOOL)shouldTheme {
+  shouldTheme_ = shouldTheme;
+}
+
 - (NSBackgroundStyle)interiorBackgroundStyle {
   return [self isHighlighted] ?
       NSBackgroundStyleLowered : NSBackgroundStyleRaised;
 }
 
+- (void)mouseEntered:(NSEvent *)theEvent {
+  isMouseInside_ = YES;
+  [[self controlView] setNeedsDisplay:YES];
+}
+
+- (void)mouseExited:(NSEvent *)theEvent {
+  isMouseInside_ = NO;
+  [[self controlView] setNeedsDisplay:YES];
+}
+
+- (BOOL)isMouseInside {
+  return trackingArea_ && isMouseInside_;
+}
+
+// Since we have our own drawWithFrame:, we need to also have our own
+// logic for determining when the mouse is inside for honoring this
+// request.
+- (void)setShowsBorderOnlyWhileMouseInside:(BOOL)showOnly {
+  [super setShowsBorderOnlyWhileMouseInside:showOnly];
+  if (showOnly) {
+    if (trackingArea_.get()) {
+      [self setShowsBorderOnlyWhileMouseInside:NO];
+    }
+    trackingArea_.reset([[NSTrackingArea alloc]
+                          initWithRect:[[self controlView]
+                                         bounds]
+                               options:(NSTrackingMouseEnteredAndExited |
+                                        NSTrackingActiveInActiveApp)
+                                 owner:self
+                            userInfo:nil]);
+    [[self controlView] addTrackingArea:trackingArea_];
+  } else {
+    if (trackingArea_) {
+      [[self controlView] removeTrackingArea:trackingArea_];
+      trackingArea_.reset(nil);
+      isMouseInside_ = NO;
+    }
+  }
+}
+
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   // Constants from Cole.  Will kConstant them once the feedback loop
   // is complete.
   NSRect drawFrame = NSInsetRect(cellFrame, 1.5, 1.5);
   NSRect innerFrame = NSInsetRect(cellFrame, 2, 2);
   ButtonType type = [[(NSControl*)controlView cell] tag];
   switch (type) {
     case kRightButtonType:
       drawFrame.origin.x -= 20;
       innerFrame.origin.x -= 2;
@@ skipping 17 matching lines @@
       [NSBezierPath bezierPathWithRoundedRect:drawFrame
                                       xRadius:radius
                                       yRadius:radius];
   NSBezierPath* outerPath =
       [NSBezierPath bezierPathWithRoundedRect:NSInsetRect(drawFrame, -1, -1)
                                       xRadius:radius + 1
                                       yRadius:radius + 1];
 
   // Stroke the borders and appropriate fill gradient. If we're borderless,
   // the only time we want to draw the inner gradient is if we're highlighted.
-  if ([self isBordered] || pressed) {
+  if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
+      pressed ||
+      [self isMouseInside]) {
     [[NSColor colorWithCalibratedWhite:1.0 alpha:0.25] set];
     [outerPath stroke];
 
     NSImage* backgroundImage =
         [theme backgroundImageForStyle:GTMThemeStyleToolBarButton state:YES];
 
     if (backgroundImage) {
       NSColor* patternColor = [NSColor colorWithPatternImage:backgroundImage];
       [patternColor set];
       // Set the phase to match window.
@@ skipping 58 matching lines @@
     NSRectFillUsingOperation(NSInsetRect(borderRect, 0, 2),
                              NSCompositeSourceOver);
     innerFrame.size.width -= 1.0;
   }
   [self drawInteriorWithFrame:innerFrame inView:controlView];
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   GTMTheme* theme = [controlView gtm_theme];
 
-  BOOL shouldTheme = YES;
-  if (shouldTheme) {
+  if (shouldTheme_) {
     BOOL isTemplate = [[self image] isTemplate];
 
     [NSGraphicsContext saveGraphicsState];
 
     CGContextRef context =
         (CGContextRef)([[NSGraphicsContext currentContext] graphicsPort]);
 
     if (isTemplate) {
       scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
       [shadow setShadowColor:[NSColor whiteColor]];
@@ skipping 21 matching lines @@
     [NSGraphicsContext restoreGraphicsState];
   } else {
     // NSCell draws these uncentered for some reason, probably because of the
     // of control in the xib
     [super drawInteriorWithFrame:NSOffsetRect(cellFrame, 0, 1)
                           inView:controlView];
   }
 }
 
 @end