From a8a6f6f85650b2ce207d07df7687afb717215d23 Mon Sep 17 00:00:00 2001 From: Daniel Pham Date: Fri, 17 Jun 2016 14:02:01 -0400 Subject: [PATCH] :apple: Fix context menus selecting first item by default. --- atom/browser/api/atom_api_menu_mac.h | 2 +- atom/browser/api/atom_api_menu_views.h | 2 +- lib/browser/api/menu.js | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_menu_mac.h b/atom/browser/api/atom_api_menu_mac.h index 293e8ec4edae..062fd9be41b6 100644 --- a/atom/browser/api/atom_api_menu_mac.h +++ b/atom/browser/api/atom_api_menu_mac.h @@ -19,7 +19,7 @@ class MenuMac : public Menu { protected: 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 menu_controller_; diff --git a/atom/browser/api/atom_api_menu_views.h b/atom/browser/api/atom_api_menu_views.h index e1daa4904028..9a7a740182dd 100644 --- a/atom/browser/api/atom_api_menu_views.h +++ b/atom/browser/api/atom_api_menu_views.h @@ -17,7 +17,7 @@ class MenuViews : public Menu { explicit MenuViews(v8::Isolate* isolate); 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: DISALLOW_COPY_AND_ASSIGN(MenuViews); diff --git a/lib/browser/api/menu.js b/lib/browser/api/menu.js index e05637e79e7d..b122fc36cf37 100644 --- a/lib/browser/api/menu.js +++ b/lib/browser/api/menu.js @@ -150,10 +150,12 @@ Menu.prototype.popup = function (window, x, y, positioningItem) { window = BrowserWindow.getFocusedWindow() } - // Default parameters. + // Default to showing under mouse location. if (typeof x !== 'number') x = -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) }