summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 01:55:13 +0000
committermaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 01:55:13 +0000
commitb53979fd573dc0041df20282789e65315000bac4 (patch)
tree7d25b48e9f5ed10145b0fee6591f68f5d395f1f7 /chrome
parenta9517ac6635bd746f26f13ac00ef8c7c69ec3cce (diff)
downloadchromium_src-b53979fd573dc0041df20282789e65315000bac4.zip
chromium_src-b53979fd573dc0041df20282789e65315000bac4.tar.gz
chromium_src-b53979fd573dc0041df20282789e65315000bac4.tar.bz2
Mac. Make bookmark toolbar drag and drop point computation work better. It was sometimes hit-testing against a hidden button (previous location of the dragged button) which made it hard to drag into a folder on the right.
BUG=83131 R=mrossetti@chromium.org Review URL: http://codereview.chromium.org/7071030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 914007d..0b67f7c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -1847,6 +1847,9 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
- (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point
fromArray:(NSArray*)array {
for (BookmarkButton* button in array) {
+ // Hidden buttons can overlap valid visible buttons, just ignore.
+ if ([button isHidden])
+ continue;
// Break early if we've gone too far.
if ((NSMinX([button frame]) > point.x) || (![button superview]))
return nil;