b7d25ccb77
* chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch https://chromium-review.googlesource.com/c/chromium/src/+/1600387 * update desktop_media_list.patch https://chromium-review.googlesource.com/c/chromium/src/+/1729156 * update notification_provenance.patch https://chromium-review.googlesource.com/c/chromium/src/+/1742779 * update printing.patch https://chromium-review.googlesource.com/c/chromium/src/+/1646772 * update verbose_generate_bpad_syms.patch https://chromium-review.googlesource.com/c/chromium/src/+/1745986 * update patch metadata * remove printing_compositor manifests https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * update for URLLoaderFactoryType enum https://chromium-review.googlesource.com/c/chromium/src/+/1754716 * remove gin string16 converter https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * ClearCompositorFrame() has been removed https://chromium-review.googlesource.com/c/chromium/src/+/1746301 * message_loop -> message_loop_current https://chromium-review.googlesource.com/c/chromium/src/+/1738552 * include resource_response header * pdf compositor no longer uses service manager https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore https://chromium-review.googlesource.com/c/chromium/src/+/1708767 * fix: make std::hash value-non-const broken by https://chromium-review.googlesource.com/c/chromium/src/+/1711202 * update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback https://chromium-review.googlesource.com/c/chromium/src/+/1753006 * chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to https://chromium-review.googlesource.com/c/chromium/src/+/1678182 and update for https://chromium-review.googlesource.com/c/chromium/src/+/1678182 * convert CookieChangeListener to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1753371 * rename ui::ClipboardType -> ui::ClipboardBuffer https://chromium-review.googlesource.com/c/chromium/src/+/1758730 * logging::LoggingSettings log_file -> log_file_path https://chromium-review.googlesource.com/c/chromium/src/+/1699477 * roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch https://chromium-review.googlesource.com/c/chromium/src/+/1759149 * update printing patch * update cookie usage and fn signatures https://chromium-review.googlesource.com/c/chromium/src/+/1758437 * chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch https://chromium-review.googlesource.com/c/chromium/src/+/1762335 * Convert enum to enum class for FocusManager::FocusChangeReason https://chromium-review.googlesource.com/c/chromium/src/+/1767281 * roll DEPS to latest lkgr * update dom_storage_limits.patch https://chromium-review.googlesource.com/c/chromium/src/+/1767556
175 lines
6.2 KiB
Text
175 lines
6.2 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/atom_api_menu_mac.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/mac/scoped_sending_event.h"
|
|
#include "base/message_loop/message_loop_current.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/task/post_task.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/unresponsive_suppressor.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
using content::BrowserThread;
|
|
|
|
namespace {
|
|
|
|
static scoped_nsobject<NSMenu> applicationMenu_;
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
namespace api {
|
|
|
|
MenuMac::MenuMac(v8::Isolate* isolate, v8::Local<v8::Object> wrapper)
|
|
: Menu(isolate, wrapper), weak_factory_(this) {}
|
|
|
|
MenuMac::~MenuMac() = default;
|
|
|
|
void MenuMac::PopupAt(TopLevelWindow* window,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
const base::Closure& callback) {
|
|
NativeWindow* native_window = window->window();
|
|
if (!native_window)
|
|
return;
|
|
|
|
auto popup =
|
|
base::BindOnce(&MenuMac::PopupOnUI, weak_factory_.GetWeakPtr(),
|
|
native_window->GetWeakPtr(), window->weak_map_id(), x, y,
|
|
positioning_item, callback);
|
|
base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, std::move(popup));
|
|
}
|
|
|
|
void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
|
|
int32_t window_id,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
base::Closure callback) {
|
|
if (!native_window)
|
|
return;
|
|
NSWindow* nswindow = native_window->GetNativeWindow().GetNativeNSWindow();
|
|
|
|
auto close_callback = base::BindRepeating(
|
|
&MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id, callback);
|
|
popup_controllers_[window_id] = base::scoped_nsobject<AtomMenuController>(
|
|
[[AtomMenuController 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 (!positioning_item) {
|
|
CGFloat windowBottom = CGRectGetMinY([view window].frame);
|
|
CGFloat lowestMenuPoint = windowBottom + position.y - [menu size].height;
|
|
CGFloat screenBottom = CGRectGetMinY([view window].screen.frame);
|
|
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.frame);
|
|
if (rightmostMenuPoint > screenRight)
|
|
position.x = position.x - [menu size].width;
|
|
|
|
[popup_controllers_[window_id] setCloseCallback:close_callback];
|
|
// Make sure events can be pumped while the menu is up.
|
|
base::MessageLoopCurrent::ScopedNestableTaskAllower 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.
|
|
electron::UnresponsiveSuppressor suppressor;
|
|
[menu popUpMenuPositioningItem:item atLocation:position inView:view];
|
|
}
|
|
|
|
void MenuMac::ClosePopupAt(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::Closure callback) {
|
|
popup_controllers_.erase(window_id);
|
|
callback.Run();
|
|
}
|
|
|
|
// static
|
|
void Menu::SetApplicationMenu(Menu* base_menu) {
|
|
MenuMac* menu = static_cast<MenuMac*>(base_menu);
|
|
base::scoped_nsobject<AtomMenuController> menu_controller(
|
|
[[AtomMenuController alloc] initWithModel:menu->model_.get()
|
|
useDefaultAccelerator:YES]);
|
|
|
|
NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
|
|
[currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
|
|
target:NSApp
|
|
argument:applicationMenu_];
|
|
applicationMenu_.reset([[menu_controller menu] retain]);
|
|
[[NSRunLoop currentRunLoop]
|
|
performSelector:@selector(setMainMenu:)
|
|
target:NSApp
|
|
argument:applicationMenu_
|
|
order:0
|
|
modes:[NSArray arrayWithObject:NSDefaultRunLoopMode]];
|
|
|
|
// Ensure the menu_controller_ is destroyed after main menu is set.
|
|
menu_controller.swap(menu->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
|
|
mate::WrappableBase* Menu::New(mate::Arguments* args) {
|
|
return new MenuMac(args->isolate(), args->GetThis());
|
|
}
|
|
|
|
} // namespace api
|
|
|
|
} // namespace electron
|