deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 22:55:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix menu tooltips

Browse source
This commit is contained in:
Lea Anthony 2021-01-23 20:59:02 +11:00
commit 343f573e78
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
v2/internal/ffenestri/menu_darwin.c
View file

@ -574,7 +574,7 @@ id processCheckboxMenuItem(Menu *menu, id parentmenu, const char *title, const c
return item;
}
id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip) {
id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char *menuid, bool disabled, const char *acceleratorkey, const char **modifiers, const char* tooltip, const char* image) {
id item = ALLOC("NSMenuItem");
// Create a MenuItemCallbackData
@ -587,6 +587,18 @@ id processTextMenuItem(Menu *menu, id parentMenu, const char *title, const char
msg(item, s("initWithTitle:action:keyEquivalent:"), str(title),
s("menuItemCallback:"), key);
if( tooltip != NULL ) {
msg(item, s("setToolTip:"), str(tooltip));
}
if( image != NULL && strlen(image) > 0) {
id data = ALLOC("NSData");
id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(image), 0);
id nsimage = ALLOC("NSImage");
msg(nsimage, s("initWithData:"), imageData);
msg(item, s("setImage:"), nsimage);
}
msg(item, s("setEnabled:"), !disabled);
msg(item, s("autorelease"));
@ -668,6 +680,9 @@ void processMenuItem(Menu *menu, id parentMenu, JsonNode *item) {
const char *acceleratorkey = NULL;
const char **modifiers = NULL;
const char *tooltip = getJSONString(item, "Tooltip");
const char *image = getJSONString(item, "Image");
// If we have an accelerator
if( accelerator != NULL ) {
// Get the key