Bug 405087 - "Drag and drop on bookmarks menu puts items in wrong spot" [p=mak77@supereva.it (Marco Bonardo [mak77]) r=Mano a=blocking-firefox3+]

browser/components/places/content/controller.js

@@ -1300,9 +1300,10 @@ PlacesMenuDNDObserver.prototype = {
         end = this._view._endMarker;
     }
 
+    var popupFirstChildY = this._popup.firstChild.boxObject.y;
     for (var i = start; i < end; i++) {
       var xulNode = this._popup.childNodes[i];
-      var nodeY = xulNode.boxObject.y - this._popup.boxObject.y;
+      var nodeY = xulNode.boxObject.y - popupFirstChildY;
       var nodeHeight = xulNode.boxObject.height;
       if (xulNode.node &&
           PlacesUtils.nodeIsFolder(xulNode.node) &&
@@ -1310,14 +1311,14 @@ PlacesMenuDNDObserver.prototype = {
         // This is a folder. If the mouse is in the top 25% of the
         // node, drop above the folder.  If it's in the middle
         // 50%, drop into the folder.  If it's past that, drop below.
-        if (event.clientY < nodeY + (nodeHeight * 0.25)) {
+        if (event.layerY < nodeY + (nodeHeight * 0.25)) {
           // Drop above this folder.
           dropPoint.ip = new InsertionPoint(resultNode.itemId, i - start,
                                             -1);
           dropPoint.beforeIndex = i;
           return dropPoint;
         }
-        else if (event.clientY < nodeY + (nodeHeight * 0.75)) {
+        else if (event.layerY < nodeY + (nodeHeight * 0.75)) {
           // Drop inside this folder.
           dropPoint.ip = new InsertionPoint(xulNode.node.itemId, -1, 1);
           dropPoint.beforeIndex = i;
@@ -1327,7 +1328,7 @@ PlacesMenuDNDObserver.prototype = {
       } else {
         // This is a non-folder node. If the mouse is above the middle,
         // drop above the folder.  Otherwise, drop below.
-        if (event.clientY < nodeY + (nodeHeight / 2)) {
+        if (event.layerY < nodeY + (nodeHeight / 2)) {
           // Drop above this bookmark.
           dropPoint.ip = new InsertionPoint(resultNode.itemId, i - start, -1);
           dropPoint.beforeIndex = i;