summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/tab_view.mm
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 16:34:45 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-27 16:34:45 +0000
commit31f2bff6d9c109d6b4eb91cc0549c9d5b076ed5c (patch)
tree25f89dfb2e4cf781d019f839ac7dd320f196e234 /chrome/browser/cocoa/tab_view.mm
parent280a4207de1c817dc7177cd75b6e7b295092ce30 (diff)
downloadchromium_src-31f2bff6d9c109d6b4eb91cc0549c9d5b076ed5c.zip
chromium_src-31f2bff6d9c109d6b4eb91cc0549c9d5b076ed5c.tar.gz
chromium_src-31f2bff6d9c109d6b4eb91cc0549c9d5b076ed5c.tar.bz2
Hook up close button in tabs. Patch from rohitrao@google.com.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_view.mm')
-rw-r--r--chrome/browser/cocoa/tab_view.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index 26ec367..fa624a7 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -29,11 +29,11 @@
return YES;
}
-// Determines which view a click in our frame actually hit. It's always this
-// view, never a child.
-// TODO(alcor): Figure out what to do with the close button. Are we using a
-// NSButton for it, or drawing it ourselves with a cell?
+// Determines which view a click in our frame actually hit. It's either this
+// view or our child close button.
- (NSView *)hitTest:(NSPoint)aPoint {
+ NSPoint viewPoint = [self convertPoint:aPoint fromView:[self superview]];
+ if (NSPointInRect(viewPoint, [closeButton_ frame])) return closeButton_;
if (NSPointInRect(aPoint, [self frame])) return self;
return nil;
}