499d893040
* feat: add support for keyboard initialized menu popup * Update docs/api/menu.md Co-authored-by: Erick Zhao <erick@hotmail.ca> * fix: add patch to chromium for keyboard accessibility menu behavior * refactor: s/initiatedByKeyboard/sourceType * fix: ignore initial mouse event to retain keyboard initiated focus * Update docs/api/menu.md Co-authored-by: Samuel Maddock <samuel.maddock@gmail.com> --------- Co-authored-by: Erick Zhao <erick@hotmail.ca> Co-authored-by: Samuel Maddock <samuel.maddock@gmail.com>
89 lines
3 KiB
C++
89 lines
3 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_menu_views.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "ui/display/screen.h"
|
|
|
|
using views::MenuRunner;
|
|
|
|
namespace electron::api {
|
|
|
|
MenuViews::MenuViews(gin::Arguments* args) : Menu(args) {}
|
|
|
|
MenuViews::~MenuViews() = default;
|
|
|
|
void MenuViews::PopupAt(BaseWindow* window,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
ui::MenuSourceType source_type,
|
|
base::OnceClosure callback) {
|
|
auto* native_window = static_cast<NativeWindowViews*>(window->window());
|
|
if (!native_window)
|
|
return;
|
|
|
|
// (-1, -1) means showing on mouse location.
|
|
gfx::Point location;
|
|
if (x == -1 || y == -1) {
|
|
location = display::Screen::GetScreen()->GetCursorScreenPoint();
|
|
} else {
|
|
gfx::Point origin = native_window->GetContentBounds().origin();
|
|
location = gfx::Point(origin.x() + x, origin.y() + y);
|
|
}
|
|
|
|
int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS;
|
|
|
|
// Make sure the Menu object would not be garbage-collected until the callback
|
|
// has run.
|
|
base::OnceClosure callback_with_ref = BindSelfToClosure(std::move(callback));
|
|
|
|
// Show the menu.
|
|
//
|
|
// Note that while views::MenuRunner accepts RepeatingCallback as close
|
|
// callback, it is fine passing OnceCallback to it because we reset the
|
|
// menu runner immediately when the menu is closed.
|
|
int32_t window_id = window->weak_map_id();
|
|
auto close_callback = base::AdaptCallbackForRepeating(
|
|
base::BindOnce(&MenuViews::OnClosed, weak_factory_.GetWeakPtr(),
|
|
window_id, std::move(callback_with_ref)));
|
|
menu_runners_[window_id] =
|
|
std::make_unique<MenuRunner>(model(), flags, std::move(close_callback));
|
|
menu_runners_[window_id]->RunMenuAt(
|
|
native_window->widget(), nullptr, gfx::Rect(location, gfx::Size()),
|
|
views::MenuAnchorPosition::kTopLeft, source_type);
|
|
}
|
|
|
|
void MenuViews::ClosePopupAt(int32_t window_id) {
|
|
auto runner = menu_runners_.find(window_id);
|
|
if (runner != menu_runners_.end()) {
|
|
// Close the runner for the window.
|
|
runner->second->Cancel();
|
|
} else if (window_id == -1) {
|
|
// Or just close all opened runners.
|
|
for (auto it = menu_runners_.begin(); it != menu_runners_.end();) {
|
|
// The iterator is invalidated after the call.
|
|
(it++)->second->Cancel();
|
|
}
|
|
}
|
|
}
|
|
|
|
void MenuViews::OnClosed(int32_t window_id, base::OnceClosure callback) {
|
|
menu_runners_.erase(window_id);
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
// static
|
|
gin::Handle<Menu> Menu::New(gin::Arguments* args) {
|
|
auto handle = gin::CreateHandle(args->isolate(),
|
|
static_cast<Menu*>(new MenuViews(args)));
|
|
gin_helper::CallMethod(args->isolate(), handle.get(), "_init");
|
|
return handle;
|
|
}
|
|
|
|
} // namespace electron::api
|