Mac: Fix stuck hover state in bookmark button...

chrome/browser/ui/cocoa/gradient_button_cell.mm

 // Copyright (c) 2010 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/ui/cocoa/gradient_button_cell.h"
 
 #include "base/logging.h"
 #import "base/scoped_nsobject.h"
 #import "chrome/browser/themes/browser_theme_provider.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
@@ skipping 10 matching lines @@
 // outer path also gives the area in which to clip. Any of the |return...|
 // arguments may be NULL (in which case the given parameter won't be returned).
 // If |returnInnerPath| or |returnOuterPath|, |*returnInnerPath| or
 // |*returnOuterPath| should be nil, respectively.
 - (void)getDrawParamsForFrame:(NSRect)cellFrame
                        inView:(NSView*)controlView
                    innerFrame:(NSRect*)returnInnerFrame
                     innerPath:(NSBezierPath**)returnInnerPath
                      clipPath:(NSBezierPath**)returnClipPath;
 
+- (void)updateTrackingAreas;
 
 @end
 
 
 static const NSTimeInterval kAnimationShowDuration = 0.2;
 
 // Note: due to a bug (?), drawWithFrame:inView: does not call
 // drawBorderAndFillForTheme::::: unless the mouse is inside.  The net
 // effect is that our "fade out" when the mouse leaves becaumes
 // instantaneous.  When I "fixed" it things looked horrible; the
@@ skipping 272 matching lines @@
 }
 
 // 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];
-      [[self controlView] removeTrackingArea:trackingArea_];
     }
-    trackingArea_.reset([[NSTrackingArea alloc]
-                          initWithRect:[[self controlView]
-                                         bounds]
-                               options:(NSTrackingMouseEnteredAndExited |
-                                        NSTrackingActiveInActiveApp)
-                                 owner:self
-                            userInfo:nil]);
-    [[self controlView] addTrackingArea:trackingArea_];
+    [self updateTrackingAreas];
   } else {
     if (trackingArea_) {
       [[self controlView] removeTrackingArea:trackingArea_];
       trackingArea_.reset(nil);
-      isMouseInside_ = NO;
+      if (isMouseInside_) {
+        isMouseInside_ = NO;
+        [[self controlView] setNeedsDisplay:YES];
+      }
     }
   }
 }
 
 // TODO(viettrungluu): clean up/reorganize.
 - (void)drawBorderAndFillForTheme:(ThemeProvider*)themeProvider
                       controlView:(NSView*)controlView
                         innerPath:(NSBezierPath*)innerPath
               showClickedGradient:(BOOL)showClickedGradient
             showHighlightGradient:(BOOL)showHighlightGradient
@@ skipping 361 matching lines @@
                            inView:(NSView*)controlView {
   NSBezierPath* boundingPath = nil;
   [self getDrawParamsForFrame:cellFrame
                        inView:controlView
                    innerFrame:NULL
                     innerPath:NULL
                      clipPath:&boundingPath];
   return boundingPath;
 }
 
+- (void)resetCursorRect:(NSRect)cellFrame inView:(NSView *)controlView
+{

[mrossetti, 2010/12/10 18:12:49]

Move brace up to end of previous line.

[Leib, 2010/12/13 17:32:00]

Done.

+  [super resetCursorRect:cellFrame inView:controlView];
+  if (trackingArea_) {

[mrossetti, 2010/12/10 18:12:49]

Note that braces are optional for single-line if bodies but should be consistent
with the general usage in the compilation unit. In this file, usage is
inconsistent so you could, if you wanted, omit the braces in this case and
several others below.

[Leib, 2010/12/13 17:32:00]

Done.

+    [self updateTrackingAreas];
+  }
+}
+
+- (void)updateTrackingAreas
+{

[mrossetti, 2010/12/10 18:12:49]

Brace up to previous line.

[Leib, 2010/12/13 17:32:00]

Done.

+  BOOL mouseInView = NO;
+  NSView *controlView = [self controlView];

[mrossetti, 2010/12/10 18:12:49]

Asterisks precede the space in Chromium.

[Leib, 2010/12/13 17:32:00]

Done.

+  NSWindow *window = [controlView window];

[mrossetti, 2010/12/10 18:12:49]

Move asterisk to before the space.

[Leib, 2010/12/13 17:32:00]

Done.

+  NSRect bounds = [controlView bounds];
+  if (window) {
+    NSPoint mousePoint = [window mouseLocationOutsideOfEventStream];
+    mousePoint = [controlView convertPointFromBase:mousePoint];
+    mouseInView = [controlView mouse:mousePoint inRect:bounds];
+  }
+
+  if (trackingArea_.get()) {
+    [controlView removeTrackingArea:trackingArea_];
+  }
+
+  NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited |
+                                  NSTrackingActiveInActiveApp;
+  if (mouseInView) {
+    options |= NSTrackingAssumeInside;
+  }
+
+  trackingArea_.reset([[NSTrackingArea alloc]
+                        initWithRect:bounds
+                             options:options
+                               owner:self
+                            userInfo:nil]);
+  if (isMouseInside_ != mouseInView) {
+    isMouseInside_ = mouseInView;
+    [controlView setNeedsDisplay:YES];
+  }
+}
+
 @end