diff options
| author | Sven Gothel <[email protected]> | 2019-11-21 03:04:33 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-11-21 03:04:33 +0100 |
| commit | 4a072cd1c09d3f2ba5fd04033091836d195c9409 (patch) | |
| tree | 079eb5ddac33ca2b9dfa34d981812617842bdebf /src/newt/native/MacWindow.m | |
| parent | e509bac8554b5a5e8a7cec6638aad53c4129eb68 (diff) | |
Bug 1393: MacOS: Wait for window position setting on main-thread (blocking)
Also issue the orderFront0 call within createWindow1 (aligned with IOS code)
Diffstat (limited to 'src/newt/native/MacWindow.m')
| -rw-r--r-- | src/newt/native/MacWindow.m | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m index ffbdc3622..064fe435a 100644 --- a/src/newt/native/MacWindow.m +++ b/src/newt/native/MacWindow.m @@ -923,27 +923,24 @@ NS_ENDHANDLER DBG_PRINT( "createWindow1.%d - %p view %p, isVisible %d\n", dbgIdx++, myWindow, myView, [myWindow isVisible]); -#if 0 - // Visible on front may lead to a deadlock on Java11 - // WindowDriver's createWindow1 caller shall issue this w/o wait - // after creation if( visible ) { - #if 0 + #if 1 + [myWindow orderFront: myWindow]; + // [myWindow performSelector:@selector(orderFront) withObject:myWindow afterDelay:0]; + #elif 0 [myWindow makeKeyAndOrderFront: myWindow]; if( NULL != parentWindow ) { [myWindow orderWindow: NSWindowAbove relativeTo: [parentWindow windowNumber]]; } - #endif - #if 1 + #else [myView setNextResponder: myWindow]; if( NULL == parentWindow ) { [myWindow orderFrontRegardless]; } else { [myWindow orderWindow: NSWindowAbove relativeTo: [parentWindow windowNumber]]; } - #endif + #endif } -#endif DBG_PRINT( "createWindow1.%d - %p view %p, isVisible %d\n", dbgIdx++, myWindow, myView, [myWindow isVisible]); |