taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-14 02:48:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move some methods to main thread

Browse Source
This commit is contained in:
Lea Anthony
2021-03-29 20:45:50 +11:00
parent 86c1ea5e6a
commit 54c99fc386
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
v2/internal/ffenestri/ffenestri_darwin.c
View File

@@ -1049,22 +1049,26 @@ void SetDebug(void *applicationPointer, int flag) {
void AddContextMenu(struct Application *app, const char *contextMenuJSON) {
// Guard against calling during shutdown
if( app->shuttingDown ) return;
AddContextMenuToStore(app->contextMenuStore, contextMenuJSON);
ON_MAIN_THREAD (
AddContextMenuToStore(app->contextMenuStore, contextMenuJSON);
);
}
void UpdateContextMenu(struct Application *app, const char* contextMenuJSON) {
// Guard against calling during shutdown
if( app->shuttingDown ) return;
UpdateContextMenuInStore(app->contextMenuStore, contextMenuJSON);
ON_MAIN_THREAD(
UpdateContextMenuInStore(app->contextMenuStore, contextMenuJSON);
);
}
void AddTrayMenu(struct Application *app, const char *trayMenuJSON) {
// Guard against calling during shutdown
if( app->shuttingDown ) return;
AddTrayMenuToStore(TrayMenuStoreSingleton, trayMenuJSON);
ON_MAIN_THREAD(
AddTrayMenuToStore(TrayMenuStoreSingleton, trayMenuJSON);
);
}
void SetTrayMenu(struct Application *app, const char* trayMenuJSON) {
@@ -1407,7 +1411,9 @@ void SetApplicationMenu(struct Application *app, const char *menuAsJSON) {
}
// Update menu
updateMenu(app, menuAsJSON);
ON_MAIN_THREAD (
updateMenu(app, menuAsJSON);
);
}
void processDialogIcons(struct hashmap_s *hashmap, const unsigned char *dialogIcons[]) {

2
v2/internal/ffenestri/menu_darwin.c
View File

@@ -624,7 +624,7 @@ id createAttributedString(const char* title, const char* fontName, int fontSize,
id attributedString = ALLOC("NSMutableAttributedString");
msg_id_id(attributedString, s("initWithString:attributes:"), str(title), dictionary);
msg_reg(attributedString, s("autorelease"));
msg_reg(dictionary, s("release"));
msg_reg(dictionary, s("autorelease"));
return attributedString;
}