gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 13:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSWindow.m (-makeFirstResponder, -sendEvent:): Correct

Browse source 
handling of new first responder not becoming first responder.
Patch suggested by Josh Freeman <pikopixel@twilightedge.com>.
This commit is contained in:
fredkiefer 2020-05-14 23:10:43 +02:00
parent 981227145e
commit be12d7bd1e
2 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2020-05-14 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSWindow.m (-makeFirstResponder, -sendEvent:): Correct
handling of new first responder not becoming first responder.
Patch suggested by Josh Freeman <pikopixel@twilightedge.com>.
2020-05-10 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXib5KeyedUnarchiver.m: Clean up NSPathCell decoding.

37
Source/NSWindow.m
View file

@ -3519,12 +3519,16 @@ checkCursorRectanglesExited(NSView *theView, NSEvent *theEvent, NSPoint lastPoi
- (BOOL) makeFirstResponder: (NSResponder*)aResponder
{
if (_firstResponder == aResponder)
return YES;
{
return YES;
}
if (aResponder != nil)
{
if (![aResponder isKindOfClass: responderClass])
return NO;
{
return NO;
}
if (![aResponder acceptsFirstResponder])
{
@ -3549,9 +3553,8 @@ checkCursorRectanglesExited(NSView *theView, NSEvent *theEvent, NSPoint lastPoi
_firstResponder = aResponder;
if ((aResponder == nil) || ![_firstResponder becomeFirstResponder])
{
_firstResponder = self;
_firstResponder = self;
[_firstResponder becomeFirstResponder];
return (aResponder == nil);
}
return YES;
@ -3956,21 +3959,21 @@ checkCursorRectanglesExited(NSView *theView, NSEvent *theEvent, NSPoint lastPoi
{
DESTROY(_lastLeftMouseDownView);
}
// Don't make buttons first responder otherwise they cannot
// send actions to the current first responder.
// TODO: First responder status update would more cleanly
// handled by -mouseDown in each control subclass (Mac OS X
// seems to do that).
if (_firstResponder != v && ![v isKindOfClass: [NSButton class]])
{
// Only try to set first responder, when the view wants it.
if ([v acceptsFirstResponder] && ![self makeFirstResponder: v])
{
return;
}
}
if (wasKey == YES || [v acceptsFirstMouse: theEvent] == YES)
{
// Don't make buttons first responder otherwise they cannot
// send actions to the current first responder.
// TODO: First responder status update would more cleanly
// handled by -mouseDown in each control subclass (Mac OS X
// seems to do that).
if (_firstResponder != v && ![v isKindOfClass: [NSButton class]])
{
// Only try to set first responder, when the view wants it.
if ([v acceptsFirstResponder] && ![self makeFirstResponder: v])
{
return;
}
}
if ([NSHelpManager isContextHelpModeActive])
{
[v helpRequested: theEvent];