Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: chrome/browser/cocoa/menu_tracked_button.mm

Issue 3137013: [Mac] Implement highlight-on-hover for the Wrench menu buttons. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/menu_tracked_button.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/menu_tracked_button.mm
diff --git a/chrome/browser/cocoa/menu_tracked_button.mm b/chrome/browser/cocoa/menu_tracked_button.mm
index 654e850243b4d0ac0e91cde08518e6eb66a84fa8..fd5b88d95277e140991e2d21ceddf6ffad46fa9f 100644
--- a/chrome/browser/cocoa/menu_tracked_button.mm
+++ b/chrome/browser/cocoa/menu_tracked_button.mm
@@ -4,29 +4,91 @@
#import "chrome/browser/cocoa/menu_tracked_button.h"
+@interface MenuTrackedButton (Private)
+- (void)doHighlight:(BOOL)highlight;
+- (void)checkMouseInRect;
+- (NSRect)insetBounds;
+@end
+
@implementation MenuTrackedButton
+- (void)updateTrackingAreas {
+ [super updateTrackingAreas];
+ [self removeTrackingRect:trackingTag_];
+ trackingTag_ = [self addTrackingRect:NSInsetRect([self bounds], 1, 1)
+ owner:self
+ userData:NULL
+ assumeInside:NO];
+}
+
+- (void)viewDidMoveToWindow {
+ [self updateTrackingAreas];
+ [self doHighlight:NO];
+}
+
- (void)mouseEntered:(NSEvent*)theEvent {
- didEnter_ = YES;
+ if (!tracking_) {
+ didEnter_ = YES;
+ }
+ [self doHighlight:YES];
[super mouseEntered:theEvent];
}
- (void)mouseExited:(NSEvent*)theEvent {
didEnter_ = NO;
tracking_ = NO;
+ [self doHighlight:NO];
[super mouseExited:theEvent];
}
- (void)mouseDragged:(NSEvent*)theEvent {
tracking_ = !didEnter_;
+
+ NSPoint point = [self convertPoint:[theEvent locationInWindow] fromView:nil];
+ BOOL highlight = NSPointInRect(point, [self insetBounds]);
+ [self doHighlight:highlight];
+
+ // If tracking in non-sticky mode, poll the mouse cursor to see if it is still
+ // over the button and thus needs to be highlighted.
+ if (tracking_) {
+ [self performSelector:@selector(checkMouseInRect)
+ withObject:nil
+ afterDelay:0.05 // This is the smallest delay that works.
pink (ping after 24hrs) 2010/08/17 17:41:01 do we really need to be checking 20 times a second
Robert Sesek 2010/08/17 18:18:04 It's absolutely necessary to check this frequently
+ inModes:[NSArray arrayWithObject:NSEventTrackingRunLoopMode]];
+ }
[super mouseDragged:theEvent];
}
- (void)mouseUp:(NSEvent*)theEvent {
+ [self doHighlight:NO];
if (!tracking_) {
return [super mouseUp:theEvent];
}
[self performClick:self];
}
+- (void)doHighlight:(BOOL)highlight {
+ [[self cell] setHighlighted:highlight];
+ [self setNeedsDisplay];
+}
+
+// Checks if the user's current mouse location is over this button. If it is,
+// she is merely hovering here. If it is not, then disable the highlight. If
pink (ping after 24hrs) 2010/08/17 17:41:01 s/she/they ? we are usually gender-neutral in comm
Robert Sesek 2010/08/17 18:18:04 'They' is plural and would break subject-verb agre
+// the menu is opened in non-sticky mode, the button does not receive enter/exit
+// mouse events and thus polling is necessary.
+- (void)checkMouseInRect {
+ NSPoint point = [NSEvent mouseLocation];
+ point = [[self window] convertScreenToBase:point];
pink (ping after 24hrs) 2010/08/17 17:41:01 I don't think you want convertScreenToBase. Check
Robert Sesek 2010/08/17 18:18:04 I was under the impression that the two were equiv
pink (ping after 24hrs) 2010/08/17 18:27:53 we've had a lot of bugs crop up from this, i think
+ point = [self convertPointFromBase:point];
Scott Hess - ex-Googler 2010/08/17 19:55:07 I find pink's comment mis-leading. I do think you
+ if (!NSPointInRect(point, [self insetBounds])) {
+ [self doHighlight:NO];
+ }
+}
+
+// Returns the bounds of the receiver slightly inset to avoid highlighting both
+// buttons in a pair that overlap.
+- (NSRect)insetBounds {
+ return NSInsetRect([self bounds], 2, 1);
+}
+
@end
« no previous file with comments | « chrome/browser/cocoa/menu_tracked_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698