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

Support Hidden/Disabled. Normal->Text

Browse Source
This commit is contained in:
Lea Anthony 2020-11-24 20:12:10 +11:00
parent 6f218264ed
commit 4fd3516f41
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
4 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -938,24 +938,25 @@ id createMenuItemNoAutorelease( id title, const char *action, const char *key) {
id createMenu(id title) { id createMenu(id title) {
id menu = ALLOC("NSMenu"); id menu = ALLOC("NSMenu");
msg(menu, s("initWithTitle:"), title); msg(menu, s("initWithTitle:"), title);
msg(menu, s("setAutoenablesItems:"), NO);
msg(menu, s("autorelease")); msg(menu, s("autorelease"));
return menu; return menu;
} }
id addMenuItem(id menu, const char *title, const char *action, const char *key, bool enabled) { id addMenuItem(id menu, const char *title, const char *action, const char *key, bool disabled) {
id item = createMenuItem(str(title), action, key); id item = createMenuItem(str(title), action, key);
msg(item, s("setEnabled:"), enabled); msg(item, s("setEnabled:"), !disabled);
msg(menu, s("addItem:"), item); msg(menu, s("addItem:"), item);
return item; return item;
} }
id addCallbackMenuItem(id menu, const char *title, const char *menuid, const char *key, bool enabled) { id addCallbackMenuItem(id menu, const char *title, const char *menuid, const char *key, bool disabled) {
id item = ALLOC("NSMenuItem"); id item = ALLOC("NSMenuItem");
id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), menuid); id wrappedId = msg(c("NSValue"), s("valueWithPointer:"), menuid);
msg(item, s("setRepresentedObject:"), wrappedId); msg(item, s("setRepresentedObject:"), wrappedId);
msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuCallback:"), str(key)); msg(item, s("initWithTitle:action:keyEquivalent:"), str(title), s("menuCallback:"), str(key));
msg(item, s("setEnabled:"), enabled); msg(item, s("setEnabled:"), !disabled);
msg(item, s("autorelease")); msg(item, s("autorelease"));
msg(menu, s("addItem:"), item); msg(menu, s("addItem:"), item);
return item; return item;
@ -979,10 +980,10 @@ void createDefaultAppMenu(id parentMenu) {
id item = createMenuItem(title, "hide:", "h"); id item = createMenuItem(title, "hide:", "h");
msg(appMenu, s("addItem:"), item); msg(appMenu, s("addItem:"), item);
id hideOthers = addMenuItem(appMenu, "Hide Others", "hideOtherApplications:", "h", TRUE); id hideOthers = addMenuItem(appMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand)); msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
addMenuItem(appMenu, "Show All", "unhideAllApplications:", "", TRUE); addMenuItem(appMenu, "Show All", "unhideAllApplications:", "", FALSE);
addSeparator(appMenu); addSeparator(appMenu);
@ -1000,13 +1001,13 @@ void createDefaultEditMenu(id parentMenu) {
msg(editMenuItem, s("setSubmenu:"), editMenu); msg(editMenuItem, s("setSubmenu:"), editMenu);
msg(parentMenu, s("addItem:"), editMenuItem); msg(parentMenu, s("addItem:"), editMenuItem);
addMenuItem(editMenu, "Undo", "undo:", "z", TRUE); addMenuItem(editMenu, "Undo", "undo:", "z", FALSE);
addMenuItem(editMenu, "Redo", "redo:", "y", TRUE); addMenuItem(editMenu, "Redo", "redo:", "y", FALSE);
addSeparator(editMenu); addSeparator(editMenu);
addMenuItem(editMenu, "Cut", "cut:", "x", TRUE); addMenuItem(editMenu, "Cut", "cut:", "x", FALSE);
addMenuItem(editMenu, "Copy", "copy:", "c", TRUE); addMenuItem(editMenu, "Copy", "copy:", "c", FALSE);
addMenuItem(editMenu, "Paste", "paste:", "v", TRUE); addMenuItem(editMenu, "Paste", "paste:", "v", FALSE);
addMenuItem(editMenu, "Select All", "selectAll:", "a", TRUE); addMenuItem(editMenu, "Select All", "selectAll:", "a", FALSE);
} }
void parseMenuRole(struct Application *app, id parentMenu, JsonNode *item) { void parseMenuRole(struct Application *app, id parentMenu, JsonNode *item) {
@ -1021,68 +1022,68 @@ void parseMenuRole(struct Application *app, id parentMenu, JsonNode *item) {
return; return;
} }
if ( STREQ(roleName, "hide")) { if ( STREQ(roleName, "hide")) {
addMenuItem(parentMenu, "Hide Window", "hide:", "h", TRUE); addMenuItem(parentMenu, "Hide Window", "hide:", "h", FALSE);
return; return;
} }
if ( STREQ(roleName, "hideothers")) { if ( STREQ(roleName, "hideothers")) {
id hideOthers = addMenuItem(parentMenu, "Hide Others", "hideOtherApplications:", "h", TRUE); id hideOthers = addMenuItem(parentMenu, "Hide Others", "hideOtherApplications:", "h", FALSE);
msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand)); msg(hideOthers, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagCommand));
return; return;
} }
if ( STREQ(roleName, "unhide")) { if ( STREQ(roleName, "unhide")) {
addMenuItem(parentMenu, "Show All", "unhideAllApplications:", "", TRUE); addMenuItem(parentMenu, "Show All", "unhideAllApplications:", "", FALSE);
return; return;
} }
if ( STREQ(roleName, "front")) { if ( STREQ(roleName, "front")) {
addMenuItem(parentMenu, "Bring All to Front", "arrangeInFront:", "", TRUE); addMenuItem(parentMenu, "Bring All to Front", "arrangeInFront:", "", FALSE);
return; return;
} }
if ( STREQ(roleName, "undo")) { if ( STREQ(roleName, "undo")) {
addMenuItem(parentMenu, "Undo", "undo:", "z", TRUE); addMenuItem(parentMenu, "Undo", "undo:", "z", FALSE);
return; return;
} }
if ( STREQ(roleName, "redo")) { if ( STREQ(roleName, "redo")) {
addMenuItem(parentMenu, "Redo", "redo:", "y", TRUE); addMenuItem(parentMenu, "Redo", "redo:", "y", FALSE);
return; return;
} }
if ( STREQ(roleName, "cut")) { if ( STREQ(roleName, "cut")) {
addMenuItem(parentMenu, "Cut", "cut:", "x", TRUE); addMenuItem(parentMenu, "Cut", "cut:", "x", FALSE);
return; return;
} }
if ( STREQ(roleName, "copy")) { if ( STREQ(roleName, "copy")) {
addMenuItem(parentMenu, "Copy", "copy:", "c", TRUE); addMenuItem(parentMenu, "Copy", "copy:", "c", FALSE);
return; return;
} }
if ( STREQ(roleName, "paste")) { if ( STREQ(roleName, "paste")) {
addMenuItem(parentMenu, "Paste", "paste:", "v", TRUE); addMenuItem(parentMenu, "Paste", "paste:", "v", FALSE);
return; return;
} }
if ( STREQ(roleName, "delete")) { if ( STREQ(roleName, "delete")) {
addMenuItem(parentMenu, "Delete", "delete:", "", TRUE); addMenuItem(parentMenu, "Delete", "delete:", "", FALSE);
return; return;
} }
if( STREQ(roleName, "pasteandmatchstyle")) { if( STREQ(roleName, "pasteandmatchstyle")) {
id pasteandmatchstyle = addMenuItem(parentMenu, "Paste and Match Style", "pasteandmatchstyle:", "v", TRUE); id pasteandmatchstyle = addMenuItem(parentMenu, "Paste and Match Style", "pasteandmatchstyle:", "v", FALSE);
msg(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand)); msg(pasteandmatchstyle, s("setKeyEquivalentModifierMask:"), (NSEventModifierFlagOption | NSEventModifierFlagShift | NSEventModifierFlagCommand));
} }
if ( STREQ(roleName, "selectall")) { if ( STREQ(roleName, "selectall")) {
addMenuItem(parentMenu, "Select All", "selectAll:", "a", TRUE); addMenuItem(parentMenu, "Select All", "selectAll:", "a", FALSE);
return; return;
} }
if ( STREQ(roleName, "minimize")) { if ( STREQ(roleName, "minimize")) {
addMenuItem(parentMenu, "Minimize", "miniaturize:", "m", TRUE); addMenuItem(parentMenu, "Minimize", "miniaturize:", "m", FALSE);
return; return;
} }
if ( STREQ(roleName, "zoom")) { if ( STREQ(roleName, "zoom")) {
addMenuItem(parentMenu, "Zoom", "performZoom:", "", TRUE); addMenuItem(parentMenu, "Zoom", "performZoom:", "", FALSE);
return; return;
} }
if ( STREQ(roleName, "quit")) { if ( STREQ(roleName, "quit")) {
addMenuItem(parentMenu, "Quit (More work TBD)", "terminate:", "q", TRUE); addMenuItem(parentMenu, "Quit (More work TBD)", "terminate:", "q", FALSE);
return; return;
} }
if ( STREQ(roleName, "togglefullscreen")) { if ( STREQ(roleName, "togglefullscreen")) {
addMenuItem(parentMenu, "Toggle Full Screen", "toggleFullScreen:", "f", TRUE); addMenuItem(parentMenu, "Toggle Full Screen", "toggleFullScreen:", "f", FALSE);
return; return;
} }
@ -1107,31 +1108,21 @@ bool getJSONBool(JsonNode *item, const char* key, bool *result) {
return false; return false;
} }
void parseNormalMenuItem(struct Application *app, id parentMenu, JsonNode *item) { void parseTextMenuItem(struct Application *app, id parentMenu, JsonNode *item, const char *label, const char *id, bool disabled) {
// Get the label
const char *label = getJSONString(item, "Label");
if ( label == NULL) {
label = "(empty)";
}
const char *menuid = getJSONString(item, "Id");
if ( menuid == NULL) {
menuid = "";
}
bool enabled = true;
getJSONBool(item, "Enabled", &enabled);
const char *accelerator = ""; const char *accelerator = "";
addCallbackMenuItem(parentMenu, label, id, accelerator, disabled);
printf("Parsing Normal Menu Item %s!!!\n", label);
addCallbackMenuItem(parentMenu, label, menuid, accelerator, enabled);
} }
void parseMenuItem(struct Application *app, id parentMenu, JsonNode *item) { void parseMenuItem(struct Application *app, id parentMenu, JsonNode *item) {
// Check if this item is hidden and if so, exit early!
bool hidden = false;
getJSONBool(item, "Hidden", &hidden);
if( hidden ) {
return;
}
// Get the role // Get the role
JsonNode *role = json_find_member(item, "Role"); JsonNode *role = json_find_member(item, "Role");
if( role != NULL ) { if( role != NULL ) {
@ -1169,11 +1160,27 @@ void parseMenuItem(struct Application *app, id parentMenu, JsonNode *item) {
return; return;
} }
// This is a user menu. Get the common data
// Get the label
const char *label = getJSONString(item, "Label");
if ( label == NULL) {
label = "(empty)";
}
const char *menuid = getJSONString(item, "Id");
if ( menuid == NULL) {
menuid = "";
}
bool disabled = false;
getJSONBool(item, "Disabled", &disabled);
// Get the Type // Get the Type
JsonNode *type = json_find_member(item, "Type"); JsonNode *type = json_find_member(item, "Type");
if( type != NULL ) { if( type != NULL ) {
if( STREQ(type->string_, "Normal")) {
parseNormalMenuItem(app, parentMenu, item); if( STREQ(type->string_, "Text")) {
parseTextMenuItem(app, parentMenu, item, label, menuid, disabled);
return; return;
} }

12
v2/pkg/menu/menuitem.go
View File

@ -6,19 +6,17 @@ type MenuItem struct {
Role Role `json:"Role,omitempty"` Role Role `json:"Role,omitempty"`
Accelerator string `json:"Accelerator,omitempty"` Accelerator string `json:"Accelerator,omitempty"`
Type Type Type Type
Enabled bool Disabled bool
Visible bool Hidden bool
Checked bool Checked bool
SubMenu []*MenuItem `json:"SubMenu,omitempty"` SubMenu []*MenuItem `json:"SubMenu,omitempty"`
} }
func Text(label string, id string) *MenuItem { func Text(label string, id string) *MenuItem {
return &MenuItem{ return &MenuItem{
Id: id, Id: id,
Label: label, Label: label,
Type: NormalType, Type: TextType,
Enabled: true,
Visible: true,
} }
} }

4
v2/pkg/menu/type.go
View File

@ -4,8 +4,8 @@ package menu
type Type string type Type string
const ( const (
// NormalType is the Normal menuitem type // TextType is the text menuitem type
NormalType Type = "Normal" TextType Type = "Text"
// SeparatorType is the Separator menuitem type // SeparatorType is the Separator menuitem type
SeparatorType Type = "Separator" SeparatorType Type = "Separator"
// SubmenuType is the Submenu menuitem type // SubmenuType is the Submenu menuitem type

10
v2/test/kitchensink/main.go
View File

@ -30,6 +30,16 @@ func main() {
menu.SubMenu("Test Submenu", []*menu.MenuItem{ menu.SubMenu("Test Submenu", []*menu.MenuItem{
menu.Text("Hi!", "hello"), // Label = "Hi!", ID= "hello" menu.Text("Hi!", "hello"), // Label = "Hi!", ID= "hello"
&menu.MenuItem{
Label: "Disabled Menu",
Type: menu.TextType,
Disabled: true,
},
&menu.MenuItem{
Label: "Hidden Menu",
Type: menu.TextType,
Hidden: true,
},
}), }),
}) })