From 9a862589370681281d9e2875b7250e1e7d394903 Mon Sep 17 00:00:00 2001
From: "avi@chromium.org"
<avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 3 Mar 2010 16:19:07 +0000
Subject: Base coordinate system != Window base coordinate system. Fixing.
BUG=http://crbug.com/36485
TEST=everything should still work
Review URL: http://codereview.chromium.org/661322
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40519 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/cocoa/tab_view.mm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'chrome/browser/cocoa/tab_view.mm')
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index a05d059..8e5c888 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -497,14 +497,13 @@ const CGFloat kRapidCloseDist = 2.5;
TabView* draggedTabView = (TabView*)[draggedController_ selectedTabView];
NSRect tabFrame = [draggedTabView frame];
tabFrame.origin = [dragWindow_ convertBaseToScreen:tabFrame.origin];
- // TODO(avi) http://crbug.com/36485; base != window
tabFrame.origin = [[targetController_ window]
convertScreenToBase:tabFrame.origin];
tabFrame = [[targetController_ tabStripView]
- convertRectFromBase:tabFrame];
+ convertRect:tabFrame fromView:nil];
NSPoint point =
[sourceWindow_ convertBaseToScreen:
- [draggedTabView convertPointToBase:NSZeroPoint]];
+ [draggedTabView convertPoint:NSZeroPoint toView:nil]];
[targetController_ insertPlaceholderForTab:self
frame:tabFrame
yStretchiness:0];
--
cgit v1.1