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

Reverted previous change. Added comments in NSWindow.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@23384 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2006-09-03 16:18:42 +00:00
parent a5a0ff01d8
commit 176822d74e
4 changed files with 105 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Source/NSControl.m
View file

@ -726,16 +726,15 @@ static Class actionCellClass;
return [[self selectedCell] acceptsFirstResponder];
}
/** <p>This method is invoked when the user click into the NSControl.</p>
*
*/
- (void) mouseDown: (NSEvent *)theEvent
{
unsigned int event_mask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSOtherMouseDraggedMask
| NSRightMouseDraggedMask;
BOOL mouseUp = NO;
int oldActionMask = 0;
NSEvent *e = nil;
// If not enabled ignore mouse clicks
if (![self isEnabled])
@ -748,11 +747,15 @@ static Class actionCellClass;
return;
}
// stop cell from sending action while tracking the mouse...
oldActionMask = [_cell sendActionOn: ([_cell isContinuous]?NSPeriodicMask:0)];
// loop until mouse goes up
e = theEvent;
while (1)
{
NSPoint location = [self convertPoint: [theEvent locationInWindow]
fromView: nil];
NSPoint location = [self convertPoint: [e locationInWindow]
fromView: nil];
// ask the cell to track the mouse only,
// if the mouse is within the cell
@ -762,28 +765,34 @@ static Class actionCellClass;
[_cell setHighlighted: YES];
[self setNeedsDisplay: YES];
done = [_cell trackMouse: theEvent
inRect: _bounds
ofView: self
untilMouseUp: [[_cell class] prefersTrackingUntilMouseUp]];
done = [_cell trackMouse: e
inRect: _bounds
ofView: self
untilMouseUp: [[_cell class] prefersTrackingUntilMouseUp]];
[_cell setHighlighted: NO];
[self setNeedsDisplay: YES];
if (done)
break;
{
mouseUp = YES;
break;
}
}
theEvent = [NSApp nextEventMatchingMask: event_mask
untilDate: nil
inMode: NSEventTrackingRunLoopMode
dequeue: YES];
if ([theEvent type] == NSLeftMouseUp)
e = [NSApp nextEventMatchingMask: event_mask
untilDate: nil
inMode: NSEventTrackingRunLoopMode
dequeue: YES];
if ([e type] == NSLeftMouseUp)
{
mouseUp = YES;
break;
}
}
// allow the cell to send actions again...
[_cell sendActionOn: oldActionMask];
// Mouse went up inside the control but not inside the cell
if (mouseUp)
{