github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-08 12:00:43 +08:00
Code Projects Activity

Handle null modifiers

Browse Source
This commit is contained in:
Lea Anthony 2020-12-20 17:55:14 +11:00
parent d380a8d6a7
commit c86aa7d3c8
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2001,20 +2001,22 @@ struct hashmap_s *menuItemMap, const char *checkboxCallbackFunction, const char
// Check if there are modifiers
JsonNode *modifiersList = json_find_member(accelerator, "Modifiers");
if ( modifiersList != NULL ) {
// Allocate an array of strings
int noOfModifiers = json_array_length(modifiersList);
modifiers = malloc(sizeof(const char *) * (noOfModifiers + 1));
JsonNode *modifier;
int count = 0;
// Iterate the modifiers and save a reference to them in our new array
json_foreach(modifier, modifiersList) {
// Get modifier name
modifiers[count] = modifier->string_;
count++;
}
// Null terminate the modifier list
modifiers[count] = NULL;
}
// Allocate an array of strings
int noOfModifiers = json_array_length(modifiersList);
if (noOfModifiers > 0) {
modifiers = malloc(sizeof(const char *) * (noOfModifiers + 1));
JsonNode *modifier;
int count = 0;
// Iterate the modifiers and save a reference to them in our new array
json_foreach(modifier, modifiersList) {
// Get modifier name
modifiers[count] = modifier->string_;
count++;
}
// Null terminate the modifier list
modifiers[count] = NULL;
}
}
}
@ -2125,6 +2127,8 @@ void parseMenuData(struct Application *app) {
// Create a new menu bar
id menubar = createMenu(str(""));
printf("\n\nmenubar = %p\n\n", menubar);
// Parse the processed menu json
app->processedMenu = json_decode(app->menuAsJSON);
@ -2147,6 +2151,7 @@ void parseMenuData(struct Application *app) {
parseMenu(app, menubar, menuData, &menuItemMapForApplicationMenu,
"checkboxMenuCallbackForApplicationMenu:", "radioMenuCallbackForApplicationMenu:", "menuCallbackForApplicationMenu:");
printf("\n\nmenubar = %p\n\n", menubar);
// Create the radiogroup cache
JsonNode *radioGroups = json_find_member(app->processedMenu, "RadioGroups");
if( radioGroups == NULL ) {
@ -2154,6 +2159,7 @@ void parseMenuData(struct Application *app) {
Fatal(app, "Unable to find RadioGroups data: %s", app->processedMenu);
return;
}
printf("\n\nmenubar = %p\n\n", menubar);
// Iterate radio groups
JsonNode *radioGroup;
@ -2161,6 +2167,7 @@ void parseMenuData(struct Application *app) {
// Get item label
processRadioGroup(radioGroup, &menuItemMapForApplicationMenu, &radioGroupMapForApplicationMenu);
}
printf("\n\nmenubar = %p\n\n", menubar);
// Apply the menu bar
msg(msg(c("NSApplication"), s("sharedApplication")), s("setMainMenu:"), menubar);