gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 22:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow a non-selected row to be dragged

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@36051 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Doug Simons 2013-01-31 17:02:40 +00:00
parent fe5d19ee8e
commit 9658c439bd
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/NSTableView.m
View file

@ -160,7 +160,7 @@ typedef struct _tableViewFlags
@interface NSTableView (EventLoopHelper)
- (void) _trackCellAtColumn:(int)column row:(int)row withEvent:(NSEvent *)ev;
- (BOOL) _startDragOperationWithEvent:(NSEvent *)theEvent;
- (BOOL) _startDragOperationWithEvent:(NSEvent *)theEvent clickedRow:(NSUInteger)clickedRow;
@end
/*
@ -3483,14 +3483,19 @@ static inline float computePeriod(NSPoint mouseLocationWin,
RELEASE(cell);
}
- (BOOL) _startDragOperationWithEvent: (NSEvent *) theEvent
- (BOOL) _startDragOperationWithEvent: (NSEvent *) theEvent clickedRow:(NSUInteger)clickedRow
{
NSPasteboard *pboard = [NSPasteboard pasteboardWithName: NSDragPboard];
NSPoint startPoint = [self convertPoint: [theEvent locationInWindow]
fromView: nil];
NSIndexSet *dragRows = _selectedRows;
if ([_selectedRows containsIndex:clickedRow] == NO) {
dragRows = [NSIndexSet indexSetWithIndex:clickedRow];
}
if ([self canDragRowsWithIndexes: _selectedRows atPoint: startPoint]
&& [self _writeRows: _selectedRows toPasteboard: pboard])
if ([self canDragRowsWithIndexes: dragRows atPoint: startPoint]
&& [self _writeRows: dragRows toPasteboard: pboard])
{
NSPoint p = NSZeroPoint;
NSImage *dragImage;
@ -3498,7 +3503,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
// FIXME
NSArray *cols = nil;
dragImage = [self dragImageForRowsWithIndexes: _selectedRows
dragImage = [self dragImageForRowsWithIndexes: dragRows
tableColumns: cols
event: theEvent
offset: &p];
@ -3756,8 +3761,8 @@ if (currentRow >= 0 && currentRow < _numberOfRows) \
if (dragOperationPossible == YES)
{
if ([_selectedRows containsIndex:_clickedRow] == NO
|| (_verticalMotionDrag == NO
if (/*[_selectedRows containsIndex:_clickedRow] == NO
|| */ (_verticalMotionDrag == NO
&& fabs(mouseLocationWin.y - initialLocation.y) > 2))
{
dragOperationPossible = NO;
@ -3766,7 +3771,7 @@ if (currentRow >= 0 && currentRow < _numberOfRows) \
|| (_verticalMotionDrag
&& fabs(mouseLocationWin.y - initialLocation.y) >= 4))
{
if ([self _startDragOperationWithEvent: theEvent])
if ([self _startDragOperationWithEvent: theEvent clickedRow:_clickedRow])
{
RELEASE(oldSelectedRows);
IF_NO_GC(DESTROY(arp));