MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:10:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-295159: obtain appmenu pointer on AppKit-thread

Browse Source 
GitOrigin-RevId: a4ddefe47da198159fb64a2af2962083327e3344
This commit is contained in:
Artem Bochkarev
2022-06-11 11:53:48 +04:00
committed by intellij-monorepo-bot
parent 62cb3f7bb6
commit 11c77aa610
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/mac/libmacscreenmenu64.dylib
View File

Binary file not shown.

20
native/MacScreenMenu/src/Menu.m
View File

@@ -410,11 +410,21 @@ Java_com_intellij_ui_mac_screenmenu_Menu_nativeFindItemByTitle(JNIEnv *env, jobj
*/
JNIEXPORT jlong JNICALL
Java_com_intellij_ui_mac_screenmenu_Menu_nativeGetAppMenu(JNIEnv *env, jclass peerClass) {
NSMenu * mainMenu = [NSApplication sharedApplication].mainMenu;
id appMenu = [mainMenu numberOfItems] > 0 ? [mainMenu itemAtIndex:0] : nil;
if (appMenu != nil) {
appMenu = [appMenu submenu];
[appMenu retain];
JNI_COCOA_ENTER();
__block id appMenu = nil;
dispatch_block_t block = ^{
NSMenu * mainMenu = [NSApplication sharedApplication].mainMenu;
appMenu = [mainMenu numberOfItems] > 0 ? [mainMenu itemAtIndex:0] : nil;
if (appMenu != nil) {
appMenu = [appMenu submenu];
[appMenu retain];
}
};
if ([NSThread isMainThread]) {
block();
} else {
dispatch_async_and_wait(dispatch_get_main_queue(), block);
}
return (jlong)appMenu;
JNI_COCOA_EXIT();
}