diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 23:26:02 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 23:26:02 +0000 |
commit | 9521d0a19f83d229aa4e663489c59d5830b3cb29 (patch) | |
tree | 37fee58707d875a713f8ed0358715ebfe714c891 | |
parent | a7cf9eb09f24b65934a69ad4de976f3172c21eb7 (diff) | |
download | chromium_src-9521d0a19f83d229aa4e663489c59d5830b3cb29.zip chromium_src-9521d0a19f83d229aa4e663489c59d5830b3cb29.tar.gz chromium_src-9521d0a19f83d229aa4e663489c59d5830b3cb29.tar.bz2 |
Tabpose/mac: Fix selecting a thumb by clicking if the mouse wasn't moved previously.
BUG=64127
TEST=See bug.
Review URL: http://codereview.chromium.org/5258002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67020 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/cocoa/tabpose_window.mm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/tabpose_window.mm b/chrome/browser/cocoa/tabpose_window.mm index eecbd65..07385ca 100644 --- a/chrome/browser/cocoa/tabpose_window.mm +++ b/chrome/browser/cocoa/tabpose_window.mm @@ -1128,7 +1128,7 @@ void AnimateCALayerFrameFromTo( return NO; } -- (void)mouseMoved:(NSEvent*)event { +-(void)selectTileFromMouseEvent:(NSEvent*)event { int newIndex = -1; CGPoint p = NSPointToCGPoint([event locationInWindow]); for (NSUInteger i = 0; i < [allThumbnailLayers_ count]; ++i) { @@ -1141,7 +1141,14 @@ void AnimateCALayerFrameFromTo( [self selectTileAtIndexWithoutAnimation:newIndex]; } +- (void)mouseMoved:(NSEvent*)event { + [self selectTileFromMouseEvent:event]; +} + - (void)mouseDown:(NSEvent*)event { + // Just in case the user clicked without ever moving the mouse. + [self selectTileFromMouseEvent:event]; + [self fadeAway:([event modifierFlags] & NSShiftKeyMask) != 0]; } |