e2b9cedf0f
feat: add support for associating a Menu with a WebFrameMain (#45138) * feat: add support for associating a Menu with a WebFrameMain This allows certain OS level features to activate such as Writing Tools, Autofill.. and Services. There appears to be a bug in macOS where the responder chain isn't traversed if the menu is not popped up using an event, as such we spoof a fake mouse event at the write coordinates in the right window and use that to open the menu. * build: fix build on non-mac * build: oops missed a header * fix: safely handle optional T* by checking nullptr too * build: fix gn check and build errors * docs: suggested changes * feat: default `frame` to `window.webContents.mainFrame` when possible * fix: avoid deref nullptr view * Revert "feat: default `frame` to `window.webContents.mainFrame` when possible" This reverts commit 2e888368199317d67f6ad931a7e9eff0295c4b1b. * fix: lint * Remove redundant scoped objects This code, including the comments, matches almost exactly the behavior of this argument to the function. * Add ScopedPumpMessagesInPrivateModes patch * More null pointer safety --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sam@electronjs.org>
94 lines
3.2 KiB
C++
94 lines
3.2 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/api/electron_api_base_window.h"
|
|
#include "shell/browser/api/electron_api_web_frame_main.h"
|
|
#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,
|
|
std::optional<WebFrameMain*> frame,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
ui::mojom::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)));
|
|
auto& runner = menu_runners_[window_id] =
|
|
std::make_unique<MenuRunner>(model(), flags, std::move(close_callback));
|
|
runner->RunMenuAt(native_window->widget(), nullptr,
|
|
gfx::Rect{location, gfx::Size{}},
|
|
views::MenuAnchorPosition::kTopLeft, source_type);
|
|
}
|
|
|
|
void MenuViews::ClosePopupAt(int32_t window_id) {
|
|
if (auto iter = menu_runners_.find(window_id); iter != menu_runners_.end()) {
|
|
// Close the runner for the window.
|
|
iter->second->Cancel();
|
|
return;
|
|
}
|
|
|
|
if (window_id == -1) {
|
|
// When -1 is passed in, close all opened runners.
|
|
// Note: `Cancel()` invalidaes iters, so move() to a temp before looping
|
|
auto tmp = std::move(menu_runners_);
|
|
for (auto& [id, runner] : tmp)
|
|
runner->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
|