Merge pull request #7501 from livecodeian/bugfix-23053

livecodepanos · web-flow · commit 3630da768db8 · 2021-01-08T19:03:15.000+02:00
[[ Bug 23053 ]] Fix frozen color picker launched from modal stack on macOS
diff --git a/docs/notes/bugfix-23053.md b/docs/notes/bugfix-23053.md
@@ -0,0 +1 @@
+# Fix the color dialog failing to respond to input events when launched from a modal stack on macOS
diff --git a/engine/src/mac-core.mm b/engine/src/mac-core.mm
@@ -788,13 +788,17 @@ bool MCPlatformWaitForEvent(double p_duration, bool p_blocking)
 	// Track whether a modal session was closed or not
 	bool t_modal_closed = false;
 	
+	// Pseudo-modal views require event dispatching, even when launched within a modal session
+	bool t_pseudo_modal;
+	t_pseudo_modal = MCMacPlatformApplicationPseudoModalFor() != nil;
+	
 	NSAutoreleasePool *t_pool;
 	t_pool = [[NSAutoreleasePool alloc] init];
 	
     // MW-2014-07-24: [[ Bug 12939 ]] If we are running a modal session, then don't then wait
     //   for events - event handling happens inside the modal session.
     NSEvent *t_event = nil;
-	if (s_modal_sessions.Size() > 0)
+	if (s_modal_sessions.Size() > 0 && !t_pseudo_modal)
 	{
 		// Wait for an event, but leave on the queue
 		t_event = [NSApp nextEventMatchingMask: p_blocking ? NSApplicationDefinedMask : NSAnyEventMask

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix the color dialog failing to respond to input events when launched from a modal stack on macOS`