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

views: Show menu on window's content view

Browse source
This commit is contained in:
Cheng Zhao 2018-03-06 16:00:18 +09:00
parent 9c7854aef6
commit 413fdc6f0d
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/api/atom_api_menu_views.cc
View file

@ -24,19 +24,16 @@ MenuViews::MenuViews(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
void MenuViews::PopupAt(BrowserWindow* window, void MenuViews::PopupAt(BrowserWindow* window,
int x, int y, int positioning_item, int x, int y, int positioning_item,
const base::Closure& callback) { const base::Closure& callback) {
NativeWindow* native_window = static_cast<NativeWindow*>(window->window()); auto* native_window = static_cast<NativeWindowViews*>(window->window());
if (!native_window) if (!native_window)
return; return;
auto* web_contents = native_window->inspectable_web_contents();
if (!web_contents)
return;
// (-1, -1) means showing on mouse location. // (-1, -1) means showing on mouse location.
gfx::Point location; gfx::Point location;
if (x == -1 || y == -1) { if (x == -1 || y == -1) {
location = display::Screen::GetScreen()->GetCursorScreenPoint(); location = display::Screen::GetScreen()->GetCursorScreenPoint();
} else { } else {
auto* view = web_contents->GetView()->GetWebView(); views::View* view = native_window; // the instance is also its content view
gfx::Point origin = view->bounds().origin(); gfx::Point origin = view->bounds().origin();
location = gfx::Point(origin.x() + x, origin.y() + y); location = gfx::Point(origin.x() + x, origin.y() + y);
} }
@ -53,7 +50,7 @@ void MenuViews::PopupAt(BrowserWindow* window,
menu_runners_[window_id] = std::unique_ptr<MenuRunner>(new MenuRunner( menu_runners_[window_id] = std::unique_ptr<MenuRunner>(new MenuRunner(
model(), flags, close_callback)); model(), flags, close_callback));
menu_runners_[window_id]->RunMenuAt( menu_runners_[window_id]->RunMenuAt(
static_cast<NativeWindowViews*>(window->window())->widget(), native_window->widget(),
NULL, NULL,
gfx::Rect(location, gfx::Size()), gfx::Rect(location, gfx::Size()),
views::MENU_ANCHOR_TOPLEFT, views::MENU_ANCHOR_TOPLEFT,