gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSTableView.m (-mouseDown): Only call editWithFrame: from a

Browse source 
double click. Don't track cells from a mouse dragged.
        Add comments.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24048 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2006-11-07 10:26:57 +00:00
parent 9bf357a90c
commit 55623d70f7
2 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,10 @@
2006-11-06 Matt Rice <ratmice@yahoo.com
2006-11-07 Matt Rice <ratmice@gmail.com>
* Source/NSTableView.m (-mouseDown): Only call editWithFrame: from a
double click. Don't track cells from a mouse dragged.
Add comments.
2006-11-06 Matt Rice <ratmice@yahoo.com>
* Source/NSTextView_actions.m: Fix keyboard movement scrolling.

39
Source/NSTableView.m
View file

@ -3459,6 +3459,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
{
NSPoint initialLocation = [theEvent locationInWindow];
NSPoint location;
int clickCount = [theEvent clickCount];
// Pathological case -- ignore mouse down
if ((_numberOfRows == 0) || (_numberOfColumns == 0))
@ -3479,7 +3480,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
_clickedColumn = [self columnAtPoint: location];
if ([theEvent type] == NSLeftMouseDown
&& [theEvent clickCount] > 1)
&& clickCount > 1)
{
// Double-click event
@ -3497,7 +3498,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
if (_clickedRow != -1)
[self sendAction: _doubleAction to: _target];
}
else
else if (clickCount == 2) // if < 2, dont want to abort editing
{
// It is OK to edit column. Go on, do it.
[self editColumn: _clickedColumn
@ -3588,18 +3589,19 @@ static inline float computePeriod(NSPoint mouseLocationWin,
*/
CREATE_AUTORELEASE_POOL(arp);
BOOL shouldComputeNewSelection = NO;
NSEventType eventType = [lastEvent type];
mouseLocationWin = [lastEvent locationInWindow];
mouseLocationView = [self convertPoint: mouseLocationWin
fromView: nil];
switch ([lastEvent type])
switch (eventType)
{
case NSLeftMouseUp:
if ((mouseLocationWin.y > minYVisible)
&& (mouseLocationWin.y < maxYVisible))
{
// mouse dragged within table
// mouse up within table
if (startedPeriodicEvents == YES)
{
[NSEvent stopPeriodicEvents];
@ -3616,6 +3618,14 @@ static inline float computePeriod(NSPoint mouseLocationWin,
if (draggingPossible == YES)
{
/*
* dragging is still possible so
* selections were never dragged,
* and a drag operation was never attempted.
* the cell was clicked,
* track the cell with the old mouseDown event
* then it will get the current event mouseUp.
*/
[self _trackCellAtColumn:_clickedColumn
row:_clickedRow
withEvent:theEvent];
@ -3692,9 +3702,26 @@ static inline float computePeriod(NSPoint mouseLocationWin,
shouldComputeNewSelection = YES;
}
[self _trackCellAtColumn:_clickedColumn
if (eventType == NSLeftMouseDown)
{
/*
* Can never get here from a dragging source
* so they need to track in mouse up.
*/
// FIXME we probably want to return from here
// if the cell wants to track until mouse up,
// which could cause selections if the mouse leaves the
// cell frame?
[self _trackCellAtColumn:_clickedColumn
row:_clickedRow
withEvent:theEvent];
}
/*
* Since we may have tracked a cell which may have caused
* a change to the currentEvent we may need to loop over
* the current event
*/
getNextEvent = (lastEvent == [NSApp currentEvent]);
}
else
@ -3780,7 +3807,7 @@ static inline float computePeriod(NSPoint mouseLocationWin,
{
/* in certain cases we are working with events that have already
* occured and been dequeued by NSCell classes, in these cases
* we set getNextEvent to NO, and get the current event.
* getNextEvent is set to NO, use the current event.
*/
if (getNextEvent == YES)
{