• SPFieldEditorSheet

- ESC and ENTER will close a non-editable sheet
* SPTooltip
- first check if tooltip should be closed and then forward the current event (this fixes an issue if a tooltip is shown while a modal window appears which could block the closing of the tooltip

1 files changed, 2 insertions, 1 deletions

diff --git a/Source/SPTooltip.m b/Source/SPTooltip.m
index 64842427..0c84061b 100644
--- a/Source/SPTooltip.m
+++ b/Source/SPTooltip.m
@@ -389,7 +389,6 @@ static float slow_in_out (float t)
 	int eventType;
 	while(event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:YES])
 	{
-		[NSApp sendEvent:event];
 		eventType = [event type];
 		if(eventType == NSKeyDown || eventType == NSLeftMouseDown || eventType == NSRightMouseDown || eventType == NSOtherMouseDown || eventType == NSScrollWheel)
 			break;
@@ -402,6 +401,8 @@ static float slow_in_out (float t)
 		
 		if(spTooltipCounter > 1)
 			break;
+		[NSApp sendEvent:event];
+
 	}
 
 	[keyWindow setAcceptsMouseMovedEvents:didAcceptMouseMovedEvents];