mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add popup method for Menu.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-14 16:50:56 +08:00
parent 667384ef74
commit 13c0a05fdd
4 changed files with 95 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
browser/api/atom_api_menu.cc
View file

@ -44,11 +44,27 @@ bool Menu::IsCommandIdEnabled(int command_id) const {
return true;
}
bool Menu::IsCommandIdVisible(int command_id) const {
return true;
}
bool Menu::GetAcceleratorForCommandId(int command_id,
ui::Accelerator* accelerator) {
return false;
}
bool Menu::IsItemForCommandIdDynamic(int command_id) const {
return false;
}
string16 Menu::GetLabelForCommandId(int command_id) const {
return string16();
}
string16 Menu::GetSublabelForCommandId(int command_id) const {
return string16();
}
void Menu::ExecuteCommand(int command_id, int event_flags) {
}
@ -256,6 +272,22 @@ v8::Handle<v8::Value> Menu::IsVisibleAt(const v8::Arguments &args) {
return v8::Boolean::New(self->model_->IsVisibleAt(args[0]->IntegerValue()));
}
// static
v8::Handle<v8::Value> Menu::Popup(const v8::Arguments &args) {
UNWRAP_MEMNU_AND_CHECK;
if (!args[0]->IsObject() || !args[1]->IsNumber() || !args[2]->IsNumber())
return node::ThrowTypeError("Bad argument");
NativeWindow* window = Unwrap<NativeWindow>(args[0]->ToObject());
if (!window)
return node::ThrowTypeError("Invalid window");
self->Popup(window, args[1]->IntegerValue(), args[2]->IntegerValue());
return v8::Undefined();
}
// static
void Menu::Initialize(v8::Handle<v8::Object> target) {
v8::HandleScope scope;
@ -269,9 +301,12 @@ void Menu::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "insertRadioItem", InsertRadioItem);
NODE_SET_PROTOTYPE_METHOD(t, "insertSeparator", InsertSeparator);
NODE_SET_PROTOTYPE_METHOD(t, "insertSubMenu", InsertSubMenu);
NODE_SET_PROTOTYPE_METHOD(t, "setIcon", SetIcon);
NODE_SET_PROTOTYPE_METHOD(t, "setSublabel", SetSublabel);
NODE_SET_PROTOTYPE_METHOD(t, "clear", Clear);
NODE_SET_PROTOTYPE_METHOD(t, "getIndexOfCommandId", GetIndexOfCommandId);
NODE_SET_PROTOTYPE_METHOD(t, "getItemCount", GetItemCount);
NODE_SET_PROTOTYPE_METHOD(t, "getCommandIdAt", GetCommandIdAt);
@ -281,6 +316,8 @@ void Menu::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "isEnabledAt", IsEnabledAt);
NODE_SET_PROTOTYPE_METHOD(t, "isVisibleAt", IsVisibleAt);
NODE_SET_PROTOTYPE_METHOD(t, "popup", Popup);
target->Set(v8::String::NewSymbol("Menu"), t->GetFunction());
}