5c7579ab1c
* chore: bump chromium in DEPS to 121.0.6128.0 * build: update patches * refactor: remove instrumentation from extensions code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5002404 * refactor: modernization of tabs_api Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4997031 * fix: add RecordHover and RecordDrag handlers * build: add missing pdf files * chore: bump chromium in DEPS to 121.0.6129.0 * chore: bump chromium in DEPS to 121.0.6131.0 * chore: update patches * refactor: remove will_cause_resize from ExitFullscreen Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5031312 * chore: add missing std converter include Before these were being inferred as std::string implicitly, not anymore Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5029573 * chore: Unwrap UserScriptList from unique_ptrs Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5005198 * refactor: add PDF internal id into PDF stream info Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4876972 * refactor: add metadata to view classes Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4994885 * chore: run lint --fix * chore: update libc++ filenames * chore: clean up menubar * chore: update patches after main merge * 5010979: Replace base::WStringPiece usage with std::wstring_view | https://chromium-review.googlesource.com/c/chromium/src/+/5010979 * chore: bump chromium in DEPS to 121.0.6142.0 * chore: update patches * 4969574: Refactor NativeDesktopMediaList | https://chromium-review.googlesource.com/c/chromium/src/+/4969574 * 5031192: [blink] Create new blink test suite that doesn't create blink Isolate | https://chromium-review.googlesource.com/c/chromium/src/+/5031192 * chore: update v8/devtools patches * 5040722: [base] Replace MakeFixedFlatTreeSorted with tag type overloads | https://chromium-review.googlesource.com/c/chromium/src/+/5040722 * 5026474: Add --generate-pdf-document-outline | https://chromium-review.googlesource.com/c/chromium/src/+/5026474 * 5024297: Change parameter of CheckMediaAccessPermission from GURL to URL::Origin | https://chromium-review.googlesource.com/c/chromium/src/+/5024297 * 5034217: [RWS] Remove CanonicalCookie::IsSameParty method | https://chromium-review.googlesource.com/c/chromium/src/+/5034217 * 5037192: Rewrite usage of RenderFrame::GetRoutingID | https://chromium-review.googlesource.com/c/chromium/src/+/5037192 * 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * chore: bump chromium in DEPS to 121.0.6143.0 * chore: bump chromium in DEPS to 121.0.6145.0 * chore: update chromium patches * 5049986: Use std::unique_ptr for MenuItemView::submenu_ member. | https://chromium-review.googlesource.com/c/chromium/src/+/5049986 * 5041595: picture-in-picture: Add PictureInPictureOcclusionTracker | https://chromium-review.googlesource.com/c/chromium/src/+/5041595 * chore: update all patches * chore: bump chromium in DEPS to 121.0.6147.0 * chore: update patches * 5051069: Use base::FunctionRef for BrowserPluginGuestManager. | https://chromium-review.googlesource.com/c/chromium/src/+/5051069 * 5057330: [base] Remove base::Erase()/base::EraseIf() overloads for std::set | https://chromium-review.googlesource.com/c/chromium/src/+/5057330 * fixup! 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * 5017518: Remove PPAPI if NaCl is disabled | https://chromium-review.googlesource.com/c/chromium/src/+/5017518 * 5002232: [DevTools] Console Insights: move from build flag to Feature API | https://chromium-review.googlesource.com/c/chromium/src/+/5002232 * 4970322: [X11] Move utils into x11::Connection | https://chromium-review.googlesource.com/c/chromium/src/+/4970322 * 5048950: Let MenuModelAdapter::CreateMenu return a std::unique_ptr<>. | https://chromium-review.googlesource.com/c/chromium/src/+/5048950 * chore: update libcxx filenames * use Context::Scope in RunScriptsAtDocument{Start,End} * 4775128: content: Reuse CC instance for main frame navigations https://chromium-review.googlesource.com/c/chromium/src/+/4775128 * also wrap WebWorkerObserver::ContextWillDestroy with Context::Scope * set LIBCPP_HARDENING_MODE https://chromium-review.googlesource.com/c/chromium/src/+/5014271 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
146 lines
4.5 KiB
C++
146 lines
4.5 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/ui/views/menu_delegate.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "shell/browser/ui/views/menu_bar.h"
|
|
#include "shell/browser/ui/views/menu_model_adapter.h"
|
|
#include "ui/views/controls/button/menu_button.h"
|
|
#include "ui/views/controls/menu/menu_item_view.h"
|
|
#include "ui/views/controls/menu/menu_runner.h"
|
|
#include "ui/views/widget/widget.h"
|
|
|
|
namespace electron {
|
|
|
|
MenuDelegate::MenuDelegate(MenuBar* menu_bar) : menu_bar_(menu_bar) {}
|
|
|
|
MenuDelegate::~MenuDelegate() = default;
|
|
|
|
void MenuDelegate::RunMenu(ElectronMenuModel* model,
|
|
views::Button* button,
|
|
ui::MenuSourceType source_type) {
|
|
gfx::Point screen_loc;
|
|
views::View::ConvertPointToScreen(button, &screen_loc);
|
|
// Subtract 1 from the height to make the popup flush with the button border.
|
|
gfx::Rect bounds(screen_loc.x(), screen_loc.y(), button->width(),
|
|
button->height() - 1);
|
|
|
|
if (source_type == ui::MENU_SOURCE_KEYBOARD) {
|
|
hold_first_switch_ = true;
|
|
}
|
|
|
|
id_ = button->GetID();
|
|
adapter_ = std::make_unique<MenuModelAdapter>(model);
|
|
|
|
auto item = std::make_unique<views::MenuItemView>(this);
|
|
static_cast<MenuModelAdapter*>(adapter_.get())->BuildMenu(item.get());
|
|
|
|
menu_runner_ = std::make_unique<views::MenuRunner>(
|
|
std::move(item),
|
|
views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
|
|
menu_runner_->RunMenuAt(
|
|
button->GetWidget()->GetTopLevelWidget(),
|
|
static_cast<views::MenuButton*>(button)->button_controller(), bounds,
|
|
views::MenuAnchorPosition::kTopRight, source_type);
|
|
}
|
|
|
|
void MenuDelegate::ExecuteCommand(int id) {
|
|
for (Observer& obs : observers_)
|
|
obs.OnBeforeExecuteCommand();
|
|
adapter_->ExecuteCommand(id);
|
|
}
|
|
|
|
void MenuDelegate::ExecuteCommand(int id, int mouse_event_flags) {
|
|
for (Observer& obs : observers_)
|
|
obs.OnBeforeExecuteCommand();
|
|
adapter_->ExecuteCommand(id, mouse_event_flags);
|
|
}
|
|
|
|
bool MenuDelegate::IsTriggerableEvent(views::MenuItemView* source,
|
|
const ui::Event& e) {
|
|
return adapter_->IsTriggerableEvent(source, e);
|
|
}
|
|
|
|
bool MenuDelegate::GetAccelerator(int id, ui::Accelerator* accelerator) const {
|
|
return adapter_->GetAccelerator(id, accelerator);
|
|
}
|
|
|
|
std::u16string MenuDelegate::GetLabel(int id) const {
|
|
return adapter_->GetLabel(id);
|
|
}
|
|
|
|
const gfx::FontList* MenuDelegate::GetLabelFontList(int id) const {
|
|
return adapter_->GetLabelFontList(id);
|
|
}
|
|
|
|
absl::optional<SkColor> MenuDelegate::GetLabelColor(int id) const {
|
|
return adapter_->GetLabelColor(id);
|
|
}
|
|
|
|
bool MenuDelegate::IsCommandEnabled(int id) const {
|
|
return adapter_->IsCommandEnabled(id);
|
|
}
|
|
|
|
bool MenuDelegate::IsCommandVisible(int id) const {
|
|
return adapter_->IsCommandVisible(id);
|
|
}
|
|
|
|
bool MenuDelegate::IsItemChecked(int id) const {
|
|
return adapter_->IsItemChecked(id);
|
|
}
|
|
|
|
void MenuDelegate::WillShowMenu(views::MenuItemView* menu) {
|
|
adapter_->WillShowMenu(menu);
|
|
}
|
|
|
|
void MenuDelegate::WillHideMenu(views::MenuItemView* menu) {
|
|
adapter_->WillHideMenu(menu);
|
|
}
|
|
|
|
void MenuDelegate::OnMenuClosed(views::MenuItemView* menu) {
|
|
for (Observer& obs : observers_)
|
|
obs.OnMenuClosed();
|
|
|
|
// Only switch to new menu when current menu is closed.
|
|
if (button_to_open_)
|
|
button_to_open_->Activate(nullptr);
|
|
delete this;
|
|
}
|
|
|
|
views::MenuItemView* MenuDelegate::GetSiblingMenu(
|
|
views::MenuItemView* menu,
|
|
const gfx::Point& screen_point,
|
|
views::MenuAnchorPosition* anchor,
|
|
bool* has_mnemonics,
|
|
views::MenuButton**) {
|
|
if (hold_first_switch_) {
|
|
hold_first_switch_ = false;
|
|
return nullptr;
|
|
}
|
|
|
|
// TODO(zcbenz): We should follow Chromium's logics on implementing the
|
|
// sibling menu switches, this code is almost a hack.
|
|
views::MenuButton* button;
|
|
ElectronMenuModel* model;
|
|
if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
|
|
button->GetID() != id_) {
|
|
bool switch_in_progress = !!button_to_open_;
|
|
// Always update target to open.
|
|
button_to_open_ = button;
|
|
// Switching menu asynchronously to avoid crash.
|
|
if (!switch_in_progress) {
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE, base::BindOnce(&views::MenuRunner::Cancel,
|
|
base::Unretained(menu_runner_.get())));
|
|
}
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
} // namespace electron
|