Merge pull request #870 from joaomoreno/popup

Allow positioning the context menu

atom/browser/api/atom_api_menu.cc

@@ -246,7 +246,8 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("isEnabledAt", &Menu::IsEnabledAt)
       .SetMethod("isVisibleAt", &Menu::IsVisibleAt)
       .SetMethod("attachToWindow", &Menu::AttachToWindow)
-      .SetMethod("_popup", &Menu::Popup);
+      .SetMethod("_popup", &Menu::Popup)
+      .SetMethod("_popupAt", &Menu::PopupAt);
 }
 
 }  // namespace api

atom/browser/api/atom_api_menu.h

@@ -55,6 +55,7 @@ class Menu : public mate::Wrappable,
 
   virtual void AttachToWindow(Window* window);
   virtual void Popup(Window* window) = 0;
+  virtual void PopupAt(Window* window, int x, int y) = 0;
 
   scoped_ptr<ui::SimpleMenuModel> model_;
   Menu* parent_;

atom/browser/api/atom_api_menu_mac.h

@@ -20,6 +20,7 @@ class MenuMac : public Menu {
   MenuMac();
 
   virtual void Popup(Window* window) OVERRIDE;
+  virtual void PopupAt(Window* window, int x, int y) OVERRIDE;
 
   base::scoped_nsobject<AtomMenuController> menu_controller_;
 

atom/browser/api/atom_api_menu_mac.mm

@@ -46,6 +46,21 @@ void MenuMac::Popup(Window* window) {
                    forView:web_contents->GetContentNativeView()];
 }
 
+void MenuMac::PopupAt(Window* window, int x, int y) {
+  base::scoped_nsobject<AtomMenuController> menu_controller(
+      [[AtomMenuController alloc] initWithModel:model_.get()]);
+
+  NativeWindow* native_window = window->window();
+  content::WebContents* web_contents = native_window->GetWebContents();
+  NSView* view = web_contents->GetContentNativeView();
+  NSMenu* menu = [menu_controller menu];
+
+  // Show the menu.
+  [menu popUpMenuPositioningItem:[menu itemAtIndex:0]
+                      atLocation:NSMakePoint(x, [view frame].size.height - y)
+                          inView:view];
+}
+
 // static
 void Menu::SetApplicationMenu(Menu* base_menu) {
   MenuMac* menu = static_cast<MenuMac*>(base_menu);

atom/browser/api/atom_api_menu_views.cc

@@ -5,6 +5,7 @@
 #include "atom/browser/api/atom_api_menu_views.h"
 
 #include "atom/browser/native_window_views.h"
+#include "content/public/browser/render_widget_host_view.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
@@ -16,14 +17,25 @@ MenuViews::MenuViews() {
 }
 
 void MenuViews::Popup(Window* window) {
-  gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
+  PopupAtPoint(window, gfx::Screen::GetNativeScreen()->GetCursorScreenPoint());
+}
+
+void MenuViews::PopupAt(Window* window, int x, int y) {
+  NativeWindow* nativeWindowViews =
+    static_cast<NativeWindow*>(window->window());
+  gfx::Point viewOrigin = nativeWindowViews->GetWebContents()
+    ->GetRenderWidgetHostView()->GetViewBounds().origin();
+  PopupAtPoint(window, gfx::Point(viewOrigin.x() + x, viewOrigin.y() + y));
+}
+
+void MenuViews::PopupAtPoint(Window* window, gfx::Point point) {
   views::MenuRunner menu_runner(
       model(),
       views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
   ignore_result(menu_runner.RunMenuAt(
       static_cast<NativeWindowViews*>(window->window())->widget(),
       NULL,
-      gfx::Rect(cursor, gfx::Size()),
+      gfx::Rect(point, gfx::Size()),
       views::MENU_ANCHOR_TOPLEFT,
       ui::MENU_SOURCE_MOUSE));
 }

atom/browser/api/atom_api_menu_views.h

@@ -6,6 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_VIEWS_H_
 
 #include "atom/browser/api/atom_api_menu.h"
+#include "ui/gfx/screen.h"
 
 namespace atom {
 
@@ -17,8 +18,10 @@ class MenuViews : public Menu {
 
  protected:
   virtual void Popup(Window* window) OVERRIDE;
+  virtual void PopupAt(Window* window, int x, int y) OVERRIDE;
 
  private:
+  void PopupAtPoint(Window* window, gfx::Point point);
   DISALLOW_COPY_AND_ASSIGN(MenuViews);
 };
 

atom/browser/api/lib/menu.coffee

@@ -45,8 +45,11 @@ Menu::_init = ->
           break
         v8Util.setHiddenValue group[0], 'checked', true unless checked
 
-Menu::popup = (window) ->
+Menu::popup = (window, x, y) ->
   throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow
+  if x? and y?
+    @_popupAt(window, x, y)
+  else
     @_popup window
 
 Menu::append = (item) ->

docs/api/menu.md

@@ -191,11 +191,15 @@ Generally, the `template` is just an array of `options` for constructing
 You can also attach other fields to element of the `template`, and they will
 become properties of the constructed menu items.
 
-### Menu.popup(browserWindow)
+### Menu.popup(browserWindow, [x, y])
 
 * `browserWindow` BrowserWindow
+* `x` Number
+* `y` Number
 
-Popups the this as context menu in the `browserWindow`.
+Popups this menu as a context menu in the `browserWindow`. You can optionally
+provide a `(x,y)` coordinate to place the menu at, otherwise it will be placed
+at the current mouse cursor position.
 
 ### Menu.append(menuItem)