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

Bugfix dealloc contextmenus. Create common.h. WIP: new menu handling

Browse Source
This commit is contained in:
Lea Anthony
2021-01-06 12:53:11 +11:00
parent 87e974e080
commit 5f2c437136
3 changed files with 142 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,8 @@
#ifdef FFENESTRI_DARWIN
#include "ffenestri_darwin.h"
#include "menu_darwin.h"
// References to assets
#include "assets.h"
@@ -145,6 +147,7 @@ struct Application {
int windowBackgroundIsTranslucent;
// Menu
Menu *applicationMenu;
const char *menuAsJSON;
JsonNode *processedMenu;
@@ -759,6 +762,7 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
result->delegate = NULL;
// Menu
result->applicationMenu = NULL;
result->menuAsJSON = NULL;
result->processedMenu = NULL;
@@ -772,6 +776,7 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
// Context Menus
result->contextMenusAsJSON = NULL;
result->processedContextMenus = NULL;
contextMenuData = NULL;
// Window Appearance
@@ -783,10 +788,6 @@ void* NewApplication(const char *title, int width, int height, int resizable, in
return (void*) result;
}
int freeHashmapItem(void *const context, struct hashmap_element_s *const e) {
free(e->data);
return -1;
}
int releaseNSObject(void *const context, struct hashmap_element_s *const e) {
msg(e->data, s("release"));
@@ -935,6 +936,11 @@ void DestroyApplication(struct Application *app) {
// Destroy the menu
destroyMenu(app);
// Delete the application menu if we have one
if( app->applicationMenu != NULL ) {
DeleteMenu(app->applicationMenu);
}
// Destroy the tray
destroyTray(app);
@@ -1420,6 +1426,7 @@ void SetDebug(void *applicationPointer, int flag) {
// SetMenu sets the initial menu for the application
void SetMenu(struct Application *app, const char *menuAsJSON) {
app->menuAsJSON = menuAsJSON;
app->applicationMenu = NewMenu(menuAsJSON);
}
// SetTray sets the initial tray menu for the application