61374019c0
* chore: bump chromium in DEPS to 103.0.5020.0 * chore: bump chromium in DEPS to 103.0.5022.0 * chore: bump chromium in DEPS to 103.0.5024.0 * chore: update patches * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 * chore: bump chromium in DEPS to 103.0.5026.0 * chore: update patches * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 * chore: bump chromium in DEPS to 103.0.5028.0 * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 * chore: fix authorization flags lint error * 3583363: Remove net wrappers around base/strings/escape.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * fixup! 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3587589: Reland "Propagate the MIME type from DownloadTargetDeterminer to DownloadItem" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587589 * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 * 3596174: [api] Remove APIs for resurrecting finalizers Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3596174 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: bump chromium in DEPS to 103.0.5030.0 * chore: update patches * chore: bump chromium in DEPS to 103.0.5032.0 * chore: bump chromium in DEPS to 103.0.5034.0 * chore: bump chromium in DEPS to 103.0.5036.0 * chore: update patches * 3586363: Introduce PrintRenderFrame.PrintWithParams() for batch printing to PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3586363 * 3593199: Remove content::PermissionType references and replace them with blink::PermissionType Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3593199 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: lint * chore: bump chromium in DEPS to 103.0.5038.0 * chore: update patches * fixup! 3560622: serial: Add SerialPort.forget() method * 3606495: mac screen capture: add metric Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3606495 * chore: bump chromium in DEPS to 103.0.5040.0 * chore: update patches * 3590840: Add IPs to DnsOverHttpsServerConfig https://chromium-review.googlesource.com/c/chromium/src/+/3590840 * stub functions for ElectronSerialDelegate and SerialChooserController to fix link * 3566412: [base] Remove base/android dependency on post_task.h and officially remove post_task.h! Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 3347944: [content] No longer hand-off whole MainFunctionParams to BrowserMainParts Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3347944 * fixup! 3566412: [base] Remove base/android dependency on post_task.h and off… e3ea3e1 …icially remove post_task.h! * chore: update process_singleton patches for content::GetIOThreadTaskRunner({}) Ref: 2015655: [BrowserThread] Migrate co/pub/br and co/br/scheduler to the new API | https://chromium-review.googlesource.com/c/chromium/src/+/2015655 * chore: migrate base::DeleteSoon to content::GetUIThreadTaskRunner({})->DeleteSoon Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * chore: remove duplicate functions for RevokePortPermissionWebInitiated & GetPortInfo * chore: migrate Linux/Windows methods off of post_task.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * chore: bump chromium in DEPS to 103.0.5042.0 * chore: update patches * 3571804: [api] Advance API deprecation for V8 version v10.2 https://chromium-review.googlesource.com/c/v8/v8/+/3571804 * fixup! 3571804: [api] Advance API deprecation for V8 version v10.2 * build: fix run-clang-format extension matching * lint * fix windows build * how is clang-format still not working for me * chore: update patches * 3623985: Replace ad-hoc SetPublicFirstPartySets calls with method in ContentBrowserClient. https://chromium-review.googlesource.com/c/chromium/src/+/3623985 * no need to implement WillProvidePublicFirstPartySets; the default is false * 3601036: [QT] Introduce ui/views/linux_ui/linux_ui_factory.* https://chromium-review.googlesource.com/c/chromium/src/+/3601036 * 3583363: Remove net wrappers around base/strings/escape.h https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * lint * chore: bump chromium in DEPS to 103.0.5044.0 * fix conflicts * chore: update patches * upgrade nan * pin version of nan in tests * replace my hacky deprecated override fix with the fix from upstream * revert runtime dcheck in v8 * pin nan version at root too * refactor: tell gyp to use c++17 when building with our node * Revert "refactor: tell gyp to use c++17 when building with our node" This reverts commit 41a03a5799a8f40f31555d73d20ea865acfcd192. * Undo the reversion of 41a03a5799a8f40f31555d73d20ea865acfcd192. This reverts commit 54440abc598153bd7e259be4a908f0ecc0b33348. * disable sequential/test-cpu-prof-kill for now * also sequential/test-diagnostic-dir-cpu-prof Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
145 lines
4.4 KiB
C++
145 lines
4.4 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->tag();
|
|
adapter_ = std::make_unique<MenuModelAdapter>(model);
|
|
|
|
auto* item = new views::MenuItemView(this);
|
|
static_cast<MenuModelAdapter*>(adapter_.get())->BuildMenu(item);
|
|
|
|
menu_runner_ = std::make_unique<views::MenuRunner>(
|
|
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->tag() != 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
|