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

🍎 Fix context menus selecting first item by default.

Browse source
This commit is contained in:
Daniel Pham 2016-06-17 14:02:01 -04:00
parent 785ae8daef
commit a8a6f6f856
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ class MenuMac : public Menu {
protected: protected:
explicit MenuMac(v8::Isolate* isolate); explicit MenuMac(v8::Isolate* isolate);
void PopupAt(Window* window, int x, int y, int positioning_item = 0) override; void PopupAt(Window* window, int x, int y, int positioning_item) override;
base::scoped_nsobject<AtomMenuController> menu_controller_; base::scoped_nsobject<AtomMenuController> menu_controller_;

2
atom/browser/api/atom_api_menu_views.h
View file

@ -17,7 +17,7 @@ class MenuViews : public Menu {
explicit MenuViews(v8::Isolate* isolate); explicit MenuViews(v8::Isolate* isolate);
protected: protected:
void PopupAt(Window* window, int x, int y, int positioning_item = 0) override; void PopupAt(Window* window, int x, int y, int positioning_item) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(MenuViews); DISALLOW_COPY_AND_ASSIGN(MenuViews);

6
lib/browser/api/menu.js
View file

@ -150,10 +150,12 @@ Menu.prototype.popup = function (window, x, y, positioningItem) {
window = BrowserWindow.getFocusedWindow() window = BrowserWindow.getFocusedWindow()
} }
// Default parameters. // Default to showing under mouse location.
if (typeof x !== 'number') x = -1 if (typeof x !== 'number') x = -1
if (typeof y !== 'number') y = -1 if (typeof y !== 'number') y = -1
if (typeof positioningItem !== 'number') positioningItem = 0
// Default to not highlighting any item.
if (typeof positioningItem !== 'number') positioningItem = -1
this.popupAt(window, x, y, positioningItem) this.popupAt(window, x, y, positioningItem)
} }