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

Add callback parameter to Menu.popup

Browse source
This commit is contained in:
Cheng Zhao 2018-01-01 16:26:19 +09:00
parent 2e3d940749
commit 7b01a8b860
6 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_menu_mac.h
View file

@ -22,18 +22,20 @@ class MenuMac : public Menu {
protected:
MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper);
void PopupAt(Window* window, int x, int y, int positioning_item) override;
void PopupAt(Window* window, int x, int y, int positioning_item,
const base::Closure& callback) override;
void PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
int32_t window_id,
int x,
int y,
int positioning_item);
int positioning_item,
const base::Closure& callback);
void ClosePopupAt(int32_t window_id) override;
private:
friend class Menu;
void OnClosed(int32_t window_id);
void OnClosed(int32_t window_id, const base::Closure& callback);
scoped_nsobject<AtomMenuController> menu_controller_;