Better detection of drag operation for NSOutlineView.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@18581 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2004-02-11 23:14:35 +00:00
parent 95bc0d2d96
commit 4096b7dac0
2 changed files with 13 additions and 10 deletions

View file

@ -1,3 +1,9 @@
2004-02-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSOutlineView.m: (-draggingUpdated:) Applied patch from
Andreas Heppel (andreas.heppel@sysgo.com) to determine drag
operation correctly.
2004-02-11 Fred Kiefer <FredKiefer@gmx.de> 2004-02-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSMatrix.m: (-setBackgroundColor:, * Source/NSMatrix.m: (-setBackgroundColor:,

View file

@ -1364,7 +1364,8 @@ static NSImage *unexpandable = nil;
int levelBefore; int levelBefore;
int levelAfter; int levelAfter;
int level; int level;
NSDragOperation dragOperation = [sender draggingSourceOperationMask];
p = [self convertPoint: p fromView: nil]; p = [self convertPoint: p fromView: nil];
verticalQuarterPosition = verticalQuarterPosition =
(p.y - _bounds.origin.y) / _rowHeight * 4.; (p.y - _bounds.origin.y) / _rowHeight * 4.;
@ -1465,14 +1466,10 @@ static NSImage *unexpandable = nil;
if ([_dataSource respondsToSelector: if ([_dataSource respondsToSelector:
@selector(outlineView:validateDrop:proposedItem:proposedChildIndex:)]) @selector(outlineView:validateDrop:proposedItem:proposedChildIndex:)])
{ {
//NSLog(@"currentDropLevel %d, currentDropRow %d", dragOperation = [_dataSource outlineView: self
//currentDropLevel, currentDropRow); validateDrop: sender
[_dataSource outlineView: self proposedItem: item
validateDrop: sender proposedChildIndex: childIndex];
proposedItem: item
proposedChildIndex: childIndex];
//NSLog(@"currentDropLevel %d, currentDropRow %d",
//currentDropLevel, currentDropRow);
} }
if ((currentDropRow != oldDropRow) || (currentDropLevel != oldDropLevel)) if ((currentDropRow != oldDropRow) || (currentDropLevel != oldDropLevel))
@ -1561,7 +1558,7 @@ static NSImage *unexpandable = nil;
} }
return NSDragOperationCopy; return dragOperation;
} }
- (BOOL) performDragOperation: (id<NSDraggingInfo>)sender - (BOOL) performDragOperation: (id<NSDraggingInfo>)sender