gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-23 19:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make connections to a whole matrix possible again in Gorm for matrixes

Browse source 
with small intercell spacing.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@31832 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Wolfgang Lux 2011-01-04 18:40:27 +00:00
parent 00d92dbb9a
commit 473806659d
2 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-01-04 Wolfgang Lux <wolfgang.lux@gmail.com>
* GormCore/GormMatrixEditor.m (-connectTargetAtPoint:,
-draggingEntered:, -performDragOperation:): Make connections to
the whole matrix possible again for matrixes with small intercell
spacing.
2011-01-04 Wolfgang Lux <wolfgang.lux@gmail.com>
* GormCore/GormDocument.m (-windowAndRect:forObject:):

48
GormCore/GormMatrixEditor.m
View file

@ -704,6 +704,31 @@ static BOOL done_editing;
return;
}
- (id) connectTargetAtPoint: (NSPoint)mouseLoc
{
int row, col;
if ([_EO getRow: &row column: &col forPoint: mouseLoc] == YES)
{
/* If a matrix has small intercell spacing (less than 1 pixel), it
becomes impossible to make connections to the whole matrix, since
-getRow:column:forPoint: returns YES for every location within the
matrix's bounds. Therefore, we accept connection to matrix cells
only if the mouse is strictly inside the cell. */
NSRect cellFrame = [_EO cellFrameAtRow: row column: col];
if (mouseLoc.x != NSMinX(cellFrame) &&
mouseLoc.x != NSMaxX(cellFrame) &&
mouseLoc.y != NSMinY(cellFrame) &&
mouseLoc.y != NSMaxY(cellFrame))
{
return [_EO cellAtRow: row column: col];
}
}
return _EO;
}
- (NSDragOperation) draggingEntered: (id<NSDraggingInfo>)sender
{
NSPasteboard *dragPb;
@ -713,16 +738,12 @@ static BOOL done_editing;
types = [dragPb types];
if ([types containsObject: GormLinkPboardType] == YES)
{
int row, col;
NSPoint loc = [sender draggingLocation];
NSPoint mouseDownPoint = [_EO convertPoint: loc fromView: nil];
if ([_EO getRow: &row column: &col forPoint: mouseDownPoint] == YES)
{
[NSApp displayConnectionBetween: [NSApp connectSource]
and: [_EO cellAtRow: row column: col]];
return NSDragOperationLink;
}
[NSApp displayConnectionBetween: [NSApp connectSource]
and: [self connectTargetAtPoint: mouseDownPoint]];
return NSDragOperationLink;
}
return [super draggingEntered: sender];
}
@ -739,19 +760,8 @@ static BOOL done_editing;
if ([types containsObject: GormLinkPboardType])
{
int row, col;
id object;
if ([_EO getRow: &row column: &col forPoint: mouseDownPoint] == YES)
{
object = [_EO cellAtRow: row column: col];
}
else
{
object = _EO;
}
[NSApp displayConnectionBetween: [NSApp connectSource]
and: object];
and: [self connectTargetAtPoint: mouseDownPoint]];
[NSApp startConnecting];
}
else if ([types containsObject: GormImagePboardType] == YES ||