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>
261 lines
9.4 KiB
Text
261 lines
9.4 KiB
Text
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#import "shell/browser/api/electron_api_menu_mac.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/mac/scoped_sending_event.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/task/current_thread.h"
|
|
#include "base/task/sequenced_task_runner.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "shell/browser/api/electron_api_base_window.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/common/keyboard_util.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace {
|
|
|
|
static NSMenu* __strong applicationMenu_;
|
|
|
|
ui::Accelerator GetAcceleratorFromKeyEquivalentAndModifierMask(
|
|
NSString* key_equivalent,
|
|
NSUInteger modifier_mask) {
|
|
std::optional<char16_t> shifted_char;
|
|
ui::KeyboardCode code = electron::KeyboardCodeFromStr(
|
|
base::SysNSStringToUTF8(key_equivalent), &shifted_char);
|
|
int modifiers = 0;
|
|
if (modifier_mask & NSEventModifierFlagShift)
|
|
modifiers |= ui::EF_SHIFT_DOWN;
|
|
if (modifier_mask & NSEventModifierFlagControl)
|
|
modifiers |= ui::EF_CONTROL_DOWN;
|
|
if (modifier_mask & NSEventModifierFlagOption)
|
|
modifiers |= ui::EF_ALT_DOWN;
|
|
if (modifier_mask & NSEventModifierFlagCommand)
|
|
modifiers |= ui::EF_COMMAND_DOWN;
|
|
return ui::Accelerator(code, modifiers);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron::api {
|
|
|
|
MenuMac::MenuMac(gin::Arguments* args) : Menu(args) {}
|
|
|
|
MenuMac::~MenuMac() = default;
|
|
|
|
void MenuMac::PopupAt(BaseWindow* window,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
ui::mojom::MenuSourceType source_type,
|
|
base::OnceClosure callback) {
|
|
NativeWindow* native_window = window->window();
|
|
if (!native_window)
|
|
return;
|
|
|
|
// Make sure the Menu object would not be garbage-collected until the callback
|
|
// has run.
|
|
base::OnceClosure callback_with_ref = BindSelfToClosure(std::move(callback));
|
|
|
|
auto popup =
|
|
base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
|
|
native_window->GetWeakPtr(), window->weak_map_id(), x, y,
|
|
positioning_item, std::move(callback_with_ref));
|
|
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
|
|
std::move(popup));
|
|
}
|
|
|
|
v8::Local<v8::Value> Menu::GetUserAcceleratorAt(int command_id) const {
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
if (![NSMenuItem usesUserKeyEquivalents])
|
|
return v8::Null(isolate);
|
|
|
|
auto controller = [[ElectronMenuController alloc] initWithModel:model()
|
|
useDefaultAccelerator:NO];
|
|
|
|
int command_index = GetIndexOfCommandId(command_id);
|
|
if (command_index == -1)
|
|
return v8::Null(isolate);
|
|
|
|
NSMenuItem* item = [controller makeMenuItemForIndex:command_index
|
|
fromModel:model()];
|
|
if ([[item userKeyEquivalent] length] == 0)
|
|
return v8::Null(isolate);
|
|
|
|
NSString* user_key_equivalent = [item keyEquivalent];
|
|
NSUInteger user_modifier_mask = [item keyEquivalentModifierMask];
|
|
ui::Accelerator accelerator = GetAcceleratorFromKeyEquivalentAndModifierMask(
|
|
user_key_equivalent, user_modifier_mask);
|
|
|
|
return gin::ConvertToV8(isolate, accelerator.GetShortcutText());
|
|
}
|
|
|
|
void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
|
|
int32_t window_id,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
base::OnceClosure callback) {
|
|
if (!native_window)
|
|
return;
|
|
NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
|
|
|
|
base::OnceClosure close_callback =
|
|
base::BindOnce(&MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id,
|
|
std::move(callback));
|
|
popup_controllers_[window_id] =
|
|
[[ElectronMenuController alloc] initWithModel:model()
|
|
useDefaultAccelerator:NO];
|
|
NSMenu* menu = [popup_controllers_[window_id] menu];
|
|
NSView* view = [nswindow contentView];
|
|
|
|
// Which menu item to show.
|
|
NSMenuItem* item = nil;
|
|
if (positioning_item < [menu numberOfItems] && positioning_item >= 0)
|
|
item = [menu itemAtIndex:positioning_item];
|
|
|
|
// (-1, -1) means showing on mouse location.
|
|
NSPoint position;
|
|
if (x == -1 || y == -1) {
|
|
position = [view convertPoint:[nswindow mouseLocationOutsideOfEventStream]
|
|
fromView:nil];
|
|
} else {
|
|
position = NSMakePoint(x, [view frame].size.height - y);
|
|
}
|
|
|
|
// If no preferred item is specified, try to show all of the menu items.
|
|
if (!item) {
|
|
CGFloat windowBottom = CGRectGetMinY([view window].frame);
|
|
CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
|
|
CGFloat screenBottom = CGRectGetMinY([view window].screen.visibleFrame);
|
|
CGFloat distanceFromBottom = lowestMenuPoint - screenBottom;
|
|
if (distanceFromBottom < 0)
|
|
position.y = position.y - distanceFromBottom + 4;
|
|
}
|
|
|
|
// Place the menu left of cursor if it is overflowing off right of screen.
|
|
CGFloat windowLeft = CGRectGetMinX([view window].frame);
|
|
CGFloat rightmostMenuPoint = windowLeft + position.x + [menu size].width;
|
|
CGFloat screenRight = CGRectGetMaxX([view window].screen.visibleFrame);
|
|
if (rightmostMenuPoint > screenRight)
|
|
position.x = position.x - [menu size].width;
|
|
|
|
[popup_controllers_[window_id] setCloseCallback:std::move(close_callback)];
|
|
// Make sure events can be pumped while the menu is up.
|
|
base::CurrentThread::ScopedAllowApplicationTasksInNativeNestedLoop allow;
|
|
|
|
// One of the events that could be pumped is |window.close()|.
|
|
// User-initiated event-tracking loops protect against this by
|
|
// setting flags in -[CrApplication sendEvent:], but since
|
|
// web-content menus are initiated by IPC message the setup has to
|
|
// be done manually.
|
|
base::mac::ScopedSendingEvent sendingEventScoper;
|
|
|
|
// Don't emit unresponsive event when showing menu.
|
|
[menu popUpMenuPositioningItem:item atLocation:position inView:view];
|
|
}
|
|
|
|
void MenuMac::ClosePopupAt(int32_t window_id) {
|
|
auto close_popup = base::BindOnce(&MenuMac::ClosePopupOnUI,
|
|
weak_factory_.GetWeakPtr(), window_id);
|
|
base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, std::move(close_popup));
|
|
}
|
|
|
|
std::u16string MenuMac::GetAcceleratorTextAtForTesting(int index) const {
|
|
// A least effort to get the real shortcut text of NSMenuItem, the code does
|
|
// not need to be perfect since it is test only.
|
|
ElectronMenuController* controller =
|
|
[[ElectronMenuController alloc] initWithModel:model()
|
|
useDefaultAccelerator:NO];
|
|
NSMenuItem* item = [[controller menu] itemAtIndex:index];
|
|
std::u16string text;
|
|
NSEventModifierFlags modifiers = [item keyEquivalentModifierMask];
|
|
if (modifiers & NSEventModifierFlagControl)
|
|
text += u"Ctrl";
|
|
if (modifiers & NSEventModifierFlagShift) {
|
|
if (!text.empty())
|
|
text += u"+";
|
|
text += u"Shift";
|
|
}
|
|
if (modifiers & NSEventModifierFlagOption) {
|
|
if (!text.empty())
|
|
text += u"+";
|
|
text += u"Alt";
|
|
}
|
|
if (modifiers & NSEventModifierFlagCommand) {
|
|
if (!text.empty())
|
|
text += u"+";
|
|
text += u"Command";
|
|
}
|
|
if (!text.empty())
|
|
text += u"+";
|
|
auto key = base::ToUpperASCII(base::SysNSStringToUTF16([item keyEquivalent]));
|
|
if (key == u"\t")
|
|
text += u"Tab";
|
|
else
|
|
text += key;
|
|
return text;
|
|
}
|
|
|
|
void MenuMac::ClosePopupOnUI(int32_t window_id) {
|
|
auto controller = popup_controllers_.find(window_id);
|
|
if (controller != popup_controllers_.end()) {
|
|
// Close the controller for the window.
|
|
[controller->second cancel];
|
|
} else if (window_id == -1) {
|
|
// Or just close all opened controllers.
|
|
for (auto it = popup_controllers_.begin();
|
|
it != popup_controllers_.end();) {
|
|
// The iterator is invalidated after the call.
|
|
[(it++)->second cancel];
|
|
}
|
|
}
|
|
}
|
|
|
|
void MenuMac::OnClosed(int32_t window_id, base::OnceClosure callback) {
|
|
popup_controllers_.erase(window_id);
|
|
std::move(callback).Run();
|
|
}
|
|
|
|
// static
|
|
void Menu::SetApplicationMenu(Menu* base_menu) {
|
|
MenuMac* menu = static_cast<MenuMac*>(base_menu);
|
|
ElectronMenuController* menu_controller =
|
|
[[ElectronMenuController alloc] initWithModel:menu->model_.get()
|
|
useDefaultAccelerator:YES];
|
|
|
|
NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
|
|
[currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
|
|
target:NSApp
|
|
argument:applicationMenu_];
|
|
applicationMenu_ = [menu_controller menu];
|
|
[[NSRunLoop currentRunLoop]
|
|
performSelector:@selector(setMainMenu:)
|
|
target:NSApp
|
|
argument:applicationMenu_
|
|
order:0
|
|
modes:[NSArray arrayWithObject:NSDefaultRunLoopMode]];
|
|
|
|
menu->menu_controller_ = menu_controller;
|
|
}
|
|
|
|
// static
|
|
void Menu::SendActionToFirstResponder(const std::string& action) {
|
|
SEL selector = NSSelectorFromString(base::SysUTF8ToNSString(action));
|
|
[NSApp sendAction:selector to:nil from:[NSApp mainMenu]];
|
|
}
|
|
|
|
// static
|
|
gin::Handle<Menu> Menu::New(gin::Arguments* args) {
|
|
auto handle =
|
|
gin::CreateHandle(args->isolate(), static_cast<Menu*>(new MenuMac(args)));
|
|
gin_helper::CallMethod(args->isolate(), handle.get(), "_init");
|
|
return handle;
|
|
}
|
|
|
|
} // namespace electron::api
|