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

Fix context menu bug

Browse Source
This commit is contained in:
Lea Anthony
2021-01-03 09:56:45 +11:00
parent cfee44b18b
commit 75e852451c
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,8 +357,8 @@ void showContextMenu(struct Application *app, const char *contextMenuID) {
id contextMenu = (id)hashmap_get(&contextMenuMap, (char*)contextMenuID, strlen(contextMenuID));
if( contextMenu == NULL ) {
printf("No context menu called '%s'. Available:", contextMenuID);
dumpHashmap("contextMenuMap", &contextMenuMap);
// printf("No context menu called '%s'. Available:", contextMenuID);
// dumpHashmap("contextMenuMap", &contextMenuMap);
// Free menu id
MEMFREE(contextMenuID);
@@ -920,11 +920,6 @@ void destroyMenu(struct Application *app) {
void destroyContextMenus(struct Application *app) {
// If we don't have a context menu, return
if( app->contextMenusAsJSON == NULL ) {
return;
}
// Free menu item hashmap
hashmap_destroy(&menuItemMapForContextMenus);
@@ -2405,9 +2400,6 @@ void dumpContextMenus(struct Application *app) {
void parseContextMenus(struct Application *app) {
// Allocation the hashmaps we need
allocateContextMenuHashMaps(app);
// Parse the context menu json
app->processedContextMenus = json_decode(app->contextMenusAsJSON);
@@ -2800,6 +2792,9 @@ void Run(struct Application *app, int argc, char **argv) {
parseTrayData(app);
}
// Allocation the hashmaps we need
allocateContextMenuHashMaps(app);
// If we have context menus, process them
if( app->contextMenusAsJSON != NULL ) {
parseContextMenus(app);