460fc9b452
* chore: bump chromium in DEPS to 132.0.6791.1 * 5804481: [UI] Migrate remaining clients of `MenuSourceType` https://chromium-review.googlesource.com/c/chromium/src/+/5804481 * chore: bump chromium in DEPS to 132.0.6793.1 * chore: bump chromium in DEPS to 132.0.6794.0 * chore: bump chromium in DEPS to 132.0.6797.0 * 5952404: Clean up //ui/base/resource from Lacros code. https://chromium-review.googlesource.com/c/chromium/src/+/5952404 * 5920842: Generate combined grd for PEPC strings and use them in the element https://chromium-review.googlesource.com/c/chromium/src/+/5920842 * 5943708: Enable DynamicSafeAreaInsets for eligible users only https://chromium-review.googlesource.com/c/chromium/src/+/5943708 * 5937004: Remove components/services/language_detection https://chromium-review.googlesource.com/c/chromium/src/+/5937004 * 5920322: [UI] Use mojo enum for `MenuSourceType` in ui/views/controls/ https://chromium-review.googlesource.com/c/chromium/src/+/5920322 * chore: fixup patch indices * chore: bump chromium in DEPS to 132.0.6799.0 * chore: bump chromium in DEPS to 132.0.6801.0 * chore: bump chromium in DEPS to 132.0.6803.0 * chore: bump chromium in DEPS to 132.0.6805.1 * chore: bump chromium in DEPS to 132.0.6807.0 * chore: bump chromium in DEPS to 132.0.6809.1 * chore: bump chromium in DEPS to 132.0.6811.1 * chore: bump chromium in DEPS to 132.0.6813.1 * chore: bump chromium in DEPS to 132.0.6815.1 * chore: bump chromium in DEPS to 132.0.6817.1 * 5947724: [ui] Add missing shortcut text for VKEY_COMMAND on linux https://chromium-review.googlesource.com/c/chromium/src/+/5947724 (cherry picked from commit 0fdf6c6e510752dcfd9d3062dff71aff55c5fdab) * 5948024: [DNT] Fix NavigationController raw_ptr during WebContents destruction https://chromium-review.googlesource.com/c/chromium/src/+/5948024 (cherry picked from commit f6662c3b6dd5f40691644911a2d527ae48015ccb) * 5945209: Roll libc++ from c8eec3629a9e to e2c39ff9388b (1 revision) https://chromium-review.googlesource.com/c/chromium/src/+/5945209 (cherry picked from commit 55b75a1456ccdb9a9771db741fed14a9706419b7) * 5942398: Remove some chrome:: namespace from chrome/browser/win/* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5942398 (cherry picked from commit d664ce2434e3995b628b3b252877df4efebc6825) * chore: fixup patch indices (cherry picked from commit 657cd6ee3470291123e8a8d0f6f189f2a3280c5d) * 5963016: FSA: Use the profile path for base::DIR_HOME on ChromeOS Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5963016 (cherry picked from commit 69505baee6d037fe370ec10c0ffa03447a43ab34) * chore: fixup patch indices (cherry picked from commit c79c2c8734a82be32cd7ff6f9d70d3be5e08e50b) * 5924816: [macOS][FSA] Block Access to Application Bundle Path Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5924816 (cherry picked from commit dbcc24fe26337d063a9623379a8e9c2b5a64ce65) * 5962517: [media] Apply inside blink to renderer/platform/media Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5962517 (cherry picked from commit f396860717dc4692c9ee036b91a07d12f3114991) * 5829616: MPArch based GuestViews basic implementation Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5829616 (cherry picked from commit b95772daa33fce58e0c09847c60511e8b53eacb2) * 5953710: Expose a rust_static_library instead of raw rs file from rust_bindgen Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5953710 (cherry picked from commit 11edc865b578d1596d42a4abfb811360c960e51c) * chore: fixup patch indices (cherry picked from commit 7be81bdd02cff8894c4fff141d39408906164a8e) * chore: disable ELF CREL on Linux Arm 5938657: Reapply "Enable ELF CREL, which reduces the size of ELF relocatable object files." | https://chromium-review.googlesource.com/c/chromium/src/+/5938657 (cherry picked from commit 48c5efd0b0ab8fdfafb1b8df2ef35150362df410) * chore: bump chromium in DEPS to 132.0.6807.0 (cherry picked from commit f41da7b5a3b8da6af161ab37c7b6792de1c008d7) * 5868889: Shared Storage: Support saved queries in selectURL Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5868889 (cherry picked from commit 4e389ef21ab0e860373b7aab0cc74beee020b2fe) * Revert "5956408: [fastapi] Promote deprecation of FastApiTypedArray" Refs: https://chromium-review.googlesource.com/c/v8/v8/+/5956408 (cherry picked from commit a4b8e46b34a01e72dbeeaa4fdbae1939402a4ca6) * Revert "5962696: [mojo] Force blink headers to only be included in blink" Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5962696 (cherry picked from commit f0228c286fcb8166ff57cda4dd2b353b4c06b69a) * chore: update patches (cherry picked from commit 3a3c527a1de9ee4f6f3e8545a8e4ff7c6ac6fa0c) * 5973073: [Extensions] Improve warnings parsing (host) permissions in MV3 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/5973073 (cherry picked from commit c571e561e0b4ba06bd40d8ec4e9cfe59ede010c5) * chore: update filenames.libcxx.gni (cherry picked from commit 7677e9bfc6b18ac3556b20fd4f4888e9f2d37431) * Apply suggestions from code review Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> (cherry picked from commit e8dd8215cff2f3f7216b31ef8edc8a3b24c56e2c) * chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
92 lines
3.1 KiB
C++
92 lines
3.1 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/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::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
|