diff --git a/calendar/base/content/calendar-multiday-view.xml b/calendar/base/content/calendar-multiday-view.xml index bc5031d0da3..6b5c3a6afd8 100644 --- a/calendar/base/content/calendar-multiday-view.xml +++ b/calendar/base/content/calendar-multiday-view.xml @@ -226,7 +226,7 @@ // still select it (since we'll preventBubble()) evbox.calendarView.selectedOccurrence = evbox.mOccurrence; // then start dragging it - evbox.parentColumn.startSweepingToModifyEvent(evbox, evbox.mOccurrence, whichside, event.clientX, event.clientY); + evbox.parentColumn.startSweepingToModifyEvent(evbox, evbox.mOccurrence, whichside, event.screenX, event.screenY); event.preventBubble(); ]]> @@ -817,7 +817,7 @@ // check if we need to jump a column if (dragState.dragType == "move") { - newcol = col.calendarView.findColumnForClientPoint(event.clientX, event.clientY); + newcol = col.calendarView.findColumnForClientPoint(event.screenX, event.screenY); if (newcol && newcol != col) { // kill our drag state col.fgboxes.dragbox.removeAttribute("dragging"); @@ -836,10 +836,10 @@ var pos; var sizeattr; if (col.getAttribute("orient") == "vertical") { - pos = event.clientY - col.parentNode.boxObject.y - dragState.mouseOffset; + pos = event.screenY - col.parentNode.boxObject.screenY - dragState.mouseOffset; sizeattr = "height"; } else { - pos = event.clientX - col.parentNode.boxObject.x - dragState.mouseOffset; + pos = event.screenX - col.parentNode.boxObject.screenX - dragState.mouseOffset; sizeattr = "width"; } // don't let pos go outside the window edges @@ -911,10 +911,10 @@ // if the user didn't sweep out at least 1 interval's worth of pixels, ignore. if (col.getAttribute("orient") == "vertical") { - if (Math.abs(event.clientY - dragState.origLoc) < (col.mPixPerMin * 15)) + if (Math.abs(event.screenY - dragState.origLoc) < (col.mPixPerMin * 15)) return; } else { - if (Math.abs(event.clientX - dragState.origLoc) < (col.mPixPerMin * 15)) + if (Math.abs(event.screenX - dragState.origLoc) < (col.mPixPerMin * 15)) return; } @@ -957,7 +957,7 @@ - + @@ -1244,8 +1244,8 @@ 9) { if (this.parentColumn) { @@ -1812,8 +1812,8 @@ = bo.x) && (aClientX < (bo.x + bo.width)) && - (aClientY >= bo.y) && (aClientY < (bo.y + bo.height))) + if ((aClientX >= bo.screenX) && (aClientX < (bo.screenX + bo.width)) && + (aClientY >= bo.screenY) && (aClientY < (bo.screenY + bo.height))) { return col.column; }