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

Corrections for state changes and drawing with cells and controls.

Browse source 
Corrections to NSWindow for key and main window notification and
first responder handling.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@1642 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gnustep 1996-07-10 20:43:47 +00:00
parent acbe822337
commit 63b2a3f068
6 changed files with 140 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

128
Source/NSButton.m
View file

@ -258,77 +258,81 @@ id MB_NSBUTTON_CLASS;
//
- (void)mouseDown:(NSEvent *)theEvent
{
NSApplication *theApp = [NSApplication sharedApplication];
BOOL mouseUp, done;
NSEvent *e;
unsigned int event_mask = NSLeftMouseDownMask | NSLeftMouseUpMask |
NSMouseMovedMask | NSLeftMouseDraggedMask | NSRightMouseDraggedMask;
NSApplication *theApp = [NSApplication sharedApplication];
BOOL mouseUp, done;
NSEvent *e;
unsigned int event_mask = NSLeftMouseDownMask | NSLeftMouseUpMask |
NSMouseMovedMask | NSLeftMouseDraggedMask | NSRightMouseDraggedMask;
NSDebugLog(@"NSButton mouseDown\n");
NSDebugLog(@"NSButton mouseDown\n");
// If we are not enabled then ignore the mouse
if (![self isEnabled])
return;
// If we are not enabled then ignore the mouse
if (![self isEnabled])
return;
// capture mouse
[[self window] captureMouse: self];
// capture mouse
[[self window] captureMouse: self];
done = NO;
e = theEvent;
while (!done)
{
mouseUp = [cell trackMouse: e inRect: bounds
ofView:self untilMouseUp:YES];
e = [theApp currentEvent];
done = NO;
e = theEvent;
while (!done)
{
mouseUp = [cell trackMouse: e inRect: bounds
ofView:self untilMouseUp:YES];
e = [theApp currentEvent];
// If mouse went up then we are done
if ((mouseUp) || ([e type] == NSLeftMouseUp))
done = YES;
else
{
NSDebugLog(@"NSButton process another event\n");
e = [theApp nextEventMatchingMask:event_mask untilDate:nil
inMode:nil dequeue:YES];
}
}
// If mouse went up then we are done
if ((mouseUp) || ([e type] == NSLeftMouseUp))
done = YES;
else
{
NSDebugLog(@"NSButton process another event\n");
e = [theApp nextEventMatchingMask:event_mask untilDate:nil
inMode:nil dequeue:YES];
}
}
// Release mouse
[[self window] releaseMouse: self];
// Release mouse
[[self window] releaseMouse: self];
// If the mouse went up in the button
if (mouseUp)
{
// Unhighlight the button
[cell highlight: NO withFrame: bounds
inView: self];
// If the mouse went up in the button
if (mouseUp)
{
// Unhighlight the button
[cell highlight: NO withFrame: bounds
inView: self];
//
// Perform different state changes based upon our type
//
switch ([cell type])
{
case NSMomentaryChangeButton:
case NSPushOnPushOffButton:
case NSToggleButton:
case NSSwitchButton:
case NSRadioButton:
case NSOnOffButton:
// Toggle our state
if ([self state])
{
[self setState:0];
NSDebugLog(@"toggle state off\n");
}
else
{
[self setState:1];
NSDebugLog(@"toggle state on\n");
}
}
//
// Perform different state changes based upon our type
//
switch ([cell type])
{
case NSToggleButton:
case NSMomentaryChangeButton:
case NSMomentaryPushButton:
/* No state changes */
break;
// Have the target perform the action
[self sendAction:[self action] to:[self target]];
}
case NSPushOnPushOffButton:
case NSSwitchButton:
case NSRadioButton:
case NSOnOffButton:
// Toggle our state
if ([self state])
{
[cell setState:0];
NSDebugLog(@"toggle state off\n");
}
else
{
[cell setState:1];
NSDebugLog(@"toggle state on\n");
}
}
// Have the target perform the action
[self sendAction:[self action] to:[self target]];
}
}
- (void)performClick:(id)sender