diff --git a/ChangeLog b/ChangeLog index 133b98614..e3d45cd19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-02-12 Fred Kiefer + + * Source/NSOutlineView.m: (-draggingUpdated:) Applied patch from + Andreas Heppel (andreas.heppel@sysgo.com) to determine drag + operation correctly. + 2004-02-11 Fred Kiefer * Source/NSMatrix.m: (-setBackgroundColor:, diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m index 6d532c0f6..e52a615f0 100644 --- a/Source/NSOutlineView.m +++ b/Source/NSOutlineView.m @@ -1364,7 +1364,8 @@ static NSImage *unexpandable = nil; int levelBefore; int levelAfter; int level; - + NSDragOperation dragOperation = [sender draggingSourceOperationMask]; + p = [self convertPoint: p fromView: nil]; verticalQuarterPosition = (p.y - _bounds.origin.y) / _rowHeight * 4.; @@ -1465,14 +1466,10 @@ static NSImage *unexpandable = nil; if ([_dataSource respondsToSelector: @selector(outlineView:validateDrop:proposedItem:proposedChildIndex:)]) { - //NSLog(@"currentDropLevel %d, currentDropRow %d", - //currentDropLevel, currentDropRow); - [_dataSource outlineView: self - validateDrop: sender - proposedItem: item - proposedChildIndex: childIndex]; - //NSLog(@"currentDropLevel %d, currentDropRow %d", - //currentDropLevel, currentDropRow); + dragOperation = [_dataSource outlineView: self + validateDrop: sender + proposedItem: item + proposedChildIndex: childIndex]; } if ((currentDropRow != oldDropRow) || (currentDropLevel != oldDropLevel)) @@ -1561,7 +1558,7 @@ static NSImage *unexpandable = nil; } - return NSDragOperationCopy; + return dragOperation; } - (BOOL) performDragOperation: (id)sender