50b9c7051e
* chore: bump chromium in DEPS to 675d7dc9f3334b15c3ec28c27db3dc19b26bd12e * chore: update patches * chore: bump chromium in DEPS to dce3562696f165a324273fcb6893f0e1fef42ab1 * chore: const interfaces are being removed from //content Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1631749 Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908139 * chore: update patches * chore: blink::MediaStreamType is now consistent and deduplicated * chore: update patches and printing code for ref -> uniq * chore: bridge_impl() --> GetInProcessNSWindowBridge Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1642988 * fixme: TotalMarkedObjectSize has been removed * chore: fix linting * chore: bump chromium in DEPS to 9503e1a2fcbf17db08094d8caae3e1407e918af3 * chore: fix slightly broken printing patch * chore: update patches for SiteInstanceImpl changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1612025 * chore: update patches for SiteInstanceImpl changes * chore: bump chromium in DEPS to 6801e6c1ddd1b7b73e594e97157ddd539ca335d7 * chore: update patches * chore: bump chromium in DEPS to 27e198912d7c1767052ec785c22e2e88b2cb4d8b * chore: remove system_request_context Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1647172 * chore: creation of FtpProtocolHandler needs an auth cache Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1639683 * fixme: disable marked spec * chore: bump chromium in DEPS to 3dcd7fe453ad13a22b114b95f05590eba74c5471 * chore: bump chromium in DEPS to bdc24128b75008743d819e298557a53205706e7c * chore: bump chromium in DEPS to 7da330b58fbe0ba94b9b94abbb8085bead220228 * update patches * remove TotalMarkedObjectSize https://chromium-review.googlesource.com/c/chromium/src/+/1631708 * add libvulkan.so to dist zip manifest on linux * chore: bump chromium in DEPS to 1e85d0f45b52649efd0010cc9dab6d2804f24443 * update patches * add angle features to gpuinfo https://chromium-review.googlesource.com/c/chromium/src/+/1638658 * mark 'marked' property as deprecated * disable webview resize test * FIXME: disable vulkan on 32-bit arm * chore: bump chromium in DEPS to cd0297c6a83fdd2b1f6bc312e7d5acca736a3c56 * Revert "FIXME: disable vulkan on 32-bit arm" This reverts commit 5c1e0ef302a6db1e72231d4e823f91bb08e281af. * backport from upstream: fix swiftshader build on arm https://swiftshader-review.googlesource.com/c/SwiftShader/+/32768/ * update patches * viz: update OutputDeviceWin to new shared memory api https://chromium-review.googlesource.com/c/chromium/src/+/1649574 * base::Contains{Key,Value} => base::Contains https://chromium-review.googlesource.com/c/chromium/src/+/1649478 * fixup! viz: update OutputDeviceWin to new shared memory api * stub out StatusIconLinuxDbus-related delegate methods https://chromium-review.googlesource.com/c/chromium/src/+/1638180 * chore: bump chromium in DEPS to 964ea3fd4bdc006d62533f5755043076220181f1 * Remove the BrowserContext methods to create URLRequestContexts for main/media partitions when a partition_domain is specified https://chromium-review.googlesource.com/c/chromium/src/+/1655087 * fixup! stub out StatusIconLinuxDbus-related delegate methods * add remote_cocoa to chromium_src deps https://chromium-review.googlesource.com/c/chromium/src/+/1657068 * fixup! stub out StatusIconLinuxDbus-related delegate methods * attempt at fix linux-debug build * add swiftshader/libvulkan.so to arm manifest * chore: bump chromium in DEPS to 28688f76afef27c36631aa274691e333ddecdc22 * update patches * chore: bump chromium in DEPS to fe7450e1578a9584189f87d59d0d1a8548bf6b90 * chore: bump chromium in DEPS to f304dfd682dc86a755a6c49a16ee6876e0db45fb * chore: bump chromium in DEPS to f0fd4d6c365aad9edd83bdfff9954c47d271b75c * Update patches * Remove no longer needed WOA patch * Put back IOThread in BrowserProcess We need this until we enable the network service. * move atom.ico to inputs * Update to latest LKGR to fix no template named 'bitset' in namespace 'std' * fixup! Put back IOThread in BrowserProcess * chore: bump chromium in DEPS to dcf9662dc9a896a175d791001350324167b1cad3 * Update patches content_allow_embedder_to_prevent_locking_scheme_registry.patch is no longer necessary as it was upstreamed via https://chromium-review.googlesource.com/c/chromium/src/+/1637040 * Fix renamed enum * Use newer docker container Contains updated dependencies * Try to track down arm test failures * Fix arm tests * chore: bump chromium in DEPS to 8cbceef57b37ee14b9c4c3405a3f7663922c5b5d * Update patches * Add needed dependencies for testing 32-bit linux * Remove arm debugging. * Remove additional debugging * Fix compiler errors * Handle new macOS helper * Fix compile error on Linux * chore: bump chromium in DEPS to 66a93991ddaff6a9f1b13d110959947cb03a1860 * Add new helper files to manifests * fix BUILD.gn for macOS * Fix compile errors * Add patch to put back colors needed for autofill/datalist * chore: bump chromium in DEPS to e89617079f11e33f33cdb3924f719a579c73704b * Updated patches * Remove no longer needed patch * Remove no longer needed patch * Fix compile error with patch * Really fix the patch * chore: bump chromium in DEPS to c70f12476a45840408f1d5ff5968e7f7ceaad9d4 * chore: bump chromium in DEPS to 06d2dd7a8933b41545a7c26349c802f570563fd5 * chore: bump chromium in DEPS to b0b9ff8f727deb519ccbec7cf1c8d9ed543d88ab * Update patches * Fix compiler errors * Fix removed ChromeNetLog * Revert "Fix removed ChromeNetLog" This reverts commit 426dfd90b5ab0a9c1df415d71c88e8aed2bd5bbe. * Remove ChromeNetLog. https://chromium-review.googlesource.com/c/chromium/src/+/1663846 * chore: bump chromium in DEPS to fefcc4926d58dccd59ac95be65eab3a4ebfe2f29 * Update patches * Update v8 patches * Fix lint error * Fix compile errors * chore: bump chromium in DEPS to 4de815ef92ef2eef515506fe09bdc466526a8fd9 * Use custom protocol to test baseURLForDataURL * Use newer SDK (10.0.18362) for Windows * Update patches * Update arm manifest since swiftshader reenabled. * Don't delete dir that isn't ever there. * Fix compile errors. * Need src dir created * Update for removed InspectorFrontendAPI.addExtensions * Revert "Use newer SDK (10.0.18362) for Windows" This reverts commit 68763a0c88cdc44b971462e49662aecc167d3d99. * Revert "Need src dir created" This reverts commit 7daedc29d0844316d4097648dde7f40f1a3848fb. * Revert "Don't delete dir that isn't ever there." This reverts commit bf424bc30ffcb23b1d9a634d4df410342536640e. * chore: bump chromium in DEPS to 97dab6b0124ea53244caf123921b5d14893bcca7 * chore: bump chromium in DEPS to c87d16d49a85dc7122781f6c979d354c20f7f78b * chore: bump chromium in DEPS to 004bcee2ea336687cedfda8f8a151806ac757d15 * chore: bump chromium in DEPS to 24428b26a9d15a013b2a253e1084ec3cb54b660b * chore: bump chromium in DEPS to fd25914e875237df88035a6abf89a70bf1360b57 * Update patches * Update node to fix build error * Fix compile errors * chore: bump chromium in DEPS to 3062b7cf090f1d9522c04ca8fa0a906f88ababe9 * chore: update node ref for pushed tags * chore: update patches for new chromium * chore: fix printing patches * Use new (10.0.18362) Windows SDK * roll node to fix v8 build issues in debug build * Add support for plugin helper * fix: add patch to fix gpu info enumeration Can be removed once CL lands upstream. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1685993 * spec: navigator.requestMIDIAccess now requires a secure origin This test requires a secure origin so we fake one. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1657952 * FIXME: temporarily disable SharedWorker tests * use released version of node-abstractsocket * fix abstract-socket
349 lines
11 KiB
C++
349 lines
11 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_bar.h"
|
|
|
|
#include <memory>
|
|
#include <set>
|
|
#include <sstream>
|
|
|
|
#include "shell/browser/ui/views/submenu_button.h"
|
|
#include "shell/common/keyboard_util.h"
|
|
#include "ui/aura/window.h"
|
|
#include "ui/base/models/menu_model.h"
|
|
#include "ui/views/background.h"
|
|
#include "ui/views/layout/box_layout.h"
|
|
#include "ui/views/widget/widget.h"
|
|
|
|
#if defined(USE_X11)
|
|
#include "chrome/browser/ui/libgtkui/gtk_util.h"
|
|
#endif
|
|
|
|
#if defined(OS_WIN)
|
|
#include "ui/gfx/color_utils.h"
|
|
#endif
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// Default color of the menu bar.
|
|
const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
|
|
|
|
} // namespace
|
|
|
|
const char MenuBar::kViewClassName[] = "ElectronMenuBar";
|
|
|
|
MenuBarColorUpdater::MenuBarColorUpdater(MenuBar* menu_bar)
|
|
: menu_bar_(menu_bar) {}
|
|
|
|
MenuBarColorUpdater::~MenuBarColorUpdater() {}
|
|
|
|
void MenuBarColorUpdater::OnDidChangeFocus(views::View* focused_before,
|
|
views::View* focused_now) {
|
|
if (menu_bar_) {
|
|
// if we've changed window focus, update menu bar colors
|
|
const auto had_focus = menu_bar_->has_focus_;
|
|
menu_bar_->has_focus_ = focused_now != nullptr;
|
|
if (menu_bar_->has_focus_ != had_focus)
|
|
menu_bar_->UpdateViewColors();
|
|
}
|
|
}
|
|
|
|
MenuBar::MenuBar(RootView* window)
|
|
: background_color_(kDefaultColor),
|
|
window_(window),
|
|
color_updater_(new MenuBarColorUpdater(this)) {
|
|
RefreshColorCache();
|
|
UpdateViewColors();
|
|
SetFocusBehavior(FocusBehavior::ALWAYS);
|
|
SetLayoutManager(std::make_unique<views::BoxLayout>(
|
|
views::BoxLayout::Orientation::kHorizontal));
|
|
window_->GetFocusManager()->AddFocusChangeListener(color_updater_.get());
|
|
}
|
|
|
|
MenuBar::~MenuBar() {
|
|
window_->GetFocusManager()->RemoveFocusChangeListener(color_updater_.get());
|
|
}
|
|
|
|
void MenuBar::SetMenu(AtomMenuModel* model) {
|
|
menu_model_ = model;
|
|
RebuildChildren();
|
|
}
|
|
|
|
void MenuBar::SetAcceleratorVisibility(bool visible) {
|
|
for (auto* child : GetChildrenInZOrder())
|
|
static_cast<SubmenuButton*>(child)->SetAcceleratorVisibility(visible);
|
|
}
|
|
|
|
MenuBar::View* MenuBar::FindAccelChild(base::char16 key) {
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
if (static_cast<SubmenuButton*>(child)->accelerator() == key)
|
|
return child;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
bool MenuBar::HasAccelerator(base::char16 key) {
|
|
return FindAccelChild(key) != nullptr;
|
|
}
|
|
|
|
void MenuBar::ActivateAccelerator(base::char16 key) {
|
|
auto* child = FindAccelChild(key);
|
|
if (child)
|
|
static_cast<SubmenuButton*>(child)->Activate(nullptr);
|
|
}
|
|
|
|
int MenuBar::GetItemCount() const {
|
|
return menu_model_ ? menu_model_->GetItemCount() : 0;
|
|
}
|
|
|
|
bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& screenPoint,
|
|
AtomMenuModel** menu_model,
|
|
views::MenuButton** button) {
|
|
if (!GetBoundsInScreen().Contains(screenPoint))
|
|
return false;
|
|
|
|
auto children = GetChildrenInZOrder();
|
|
for (int i = 0, n = children.size(); i < n; ++i) {
|
|
if (children[i]->GetBoundsInScreen().Contains(screenPoint) &&
|
|
(menu_model_->GetTypeAt(i) == AtomMenuModel::TYPE_SUBMENU)) {
|
|
*menu_model = menu_model_->GetSubmenuModelAt(i);
|
|
*button = static_cast<views::MenuButton*>(children[i]);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void MenuBar::OnBeforeExecuteCommand() {
|
|
if (GetPaneFocusTraversable() != nullptr) {
|
|
RemovePaneFocus();
|
|
}
|
|
window_->RestoreFocus();
|
|
}
|
|
|
|
void MenuBar::OnMenuClosed() {
|
|
SetAcceleratorVisibility(true);
|
|
}
|
|
|
|
bool MenuBar::AcceleratorPressed(const ui::Accelerator& accelerator) {
|
|
views::View* focused_view = GetFocusManager()->GetFocusedView();
|
|
if (!ContainsForFocusSearch(this, focused_view))
|
|
return false;
|
|
|
|
switch (accelerator.key_code()) {
|
|
case ui::VKEY_MENU:
|
|
case ui::VKEY_ESCAPE: {
|
|
RemovePaneFocus();
|
|
window_->RestoreFocus();
|
|
return true;
|
|
}
|
|
case ui::VKEY_LEFT:
|
|
GetFocusManager()->AdvanceFocus(true);
|
|
return true;
|
|
case ui::VKEY_RIGHT:
|
|
GetFocusManager()->AdvanceFocus(false);
|
|
return true;
|
|
case ui::VKEY_HOME:
|
|
GetFocusManager()->SetFocusedViewWithReason(
|
|
GetFirstFocusableChild(), views::FocusManager::kReasonFocusTraversal);
|
|
return true;
|
|
case ui::VKEY_END:
|
|
GetFocusManager()->SetFocusedViewWithReason(
|
|
GetLastFocusableChild(), views::FocusManager::kReasonFocusTraversal);
|
|
return true;
|
|
default: {
|
|
auto children = GetChildrenInZOrder();
|
|
for (int i = 0, n = children.size(); i < n; ++i) {
|
|
auto* button = static_cast<SubmenuButton*>(children[i]);
|
|
bool shifted = false;
|
|
auto keycode =
|
|
electron::KeyboardCodeFromCharCode(button->accelerator(), &shifted);
|
|
|
|
if (keycode == accelerator.key_code()) {
|
|
const gfx::Point p(0, 0);
|
|
auto event = accelerator.ToKeyEvent();
|
|
OnMenuButtonClicked(button, p, &event);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool MenuBar::SetPaneFocus(views::View* initial_focus) {
|
|
// TODO(zcbenz): Submit patch to upstream Chromium to fix the crash.
|
|
//
|
|
// Without this check, Electron would crash when running tests.
|
|
//
|
|
// Check failed: rules_->CanFocusWindow(window, nullptr).
|
|
// logging::LogMessage::~LogMessage
|
|
// wm::FocusController::SetFocusedWindow
|
|
// wm::FocusController::ResetFocusWithinActiveWindow
|
|
// views::View::OnFocus
|
|
// views::Button::OnFocus
|
|
// views::LabelButton::OnFocus
|
|
// views::View::Focus
|
|
// views::FocusManager::SetFocusedViewWithReason
|
|
// views::AccessiblePaneView::SetPaneFocus
|
|
// electron::MenuBar::SetPaneFocus
|
|
if (initial_focus && initial_focus->GetWidget()) {
|
|
aura::Window* window = initial_focus->GetWidget()->GetNativeWindow();
|
|
if (!window || !window->GetRootWindow())
|
|
return false;
|
|
}
|
|
|
|
bool result = views::AccessiblePaneView::SetPaneFocus(initial_focus);
|
|
|
|
if (result) {
|
|
auto children = GetChildrenInZOrder();
|
|
std::set<ui::KeyboardCode> reg;
|
|
for (int i = 0, n = children.size(); i < n; ++i) {
|
|
auto* button = static_cast<SubmenuButton*>(children[i]);
|
|
bool shifted = false;
|
|
auto keycode =
|
|
electron::KeyboardCodeFromCharCode(button->accelerator(), &shifted);
|
|
|
|
// We want the menu items to activate if the user presses the accelerator
|
|
// key, even without alt, since we are now focused on the menu bar
|
|
if (keycode != ui::VKEY_UNKNOWN && reg.find(keycode) != reg.end()) {
|
|
reg.insert(keycode);
|
|
focus_manager()->RegisterAccelerator(
|
|
ui::Accelerator(keycode, ui::EF_NONE),
|
|
ui::AcceleratorManager::kNormalPriority, this);
|
|
}
|
|
}
|
|
|
|
// We want to remove focus / hide menu bar when alt is pressed again
|
|
focus_manager()->RegisterAccelerator(
|
|
ui::Accelerator(ui::VKEY_MENU, ui::EF_ALT_DOWN),
|
|
ui::AcceleratorManager::kNormalPriority, this);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void MenuBar::RemovePaneFocus() {
|
|
views::AccessiblePaneView::RemovePaneFocus();
|
|
SetAcceleratorVisibility(false);
|
|
|
|
auto children = GetChildrenInZOrder();
|
|
std::set<ui::KeyboardCode> unreg;
|
|
for (int i = 0, n = children.size(); i < n; ++i) {
|
|
auto* button = static_cast<SubmenuButton*>(children[i]);
|
|
bool shifted = false;
|
|
auto keycode =
|
|
electron::KeyboardCodeFromCharCode(button->accelerator(), &shifted);
|
|
|
|
if (keycode != ui::VKEY_UNKNOWN && unreg.find(keycode) != unreg.end()) {
|
|
unreg.insert(keycode);
|
|
focus_manager()->UnregisterAccelerator(
|
|
ui::Accelerator(keycode, ui::EF_NONE), this);
|
|
}
|
|
}
|
|
|
|
focus_manager()->UnregisterAccelerator(
|
|
ui::Accelerator(ui::VKEY_MENU, ui::EF_ALT_DOWN), this);
|
|
}
|
|
|
|
const char* MenuBar::GetClassName() const {
|
|
return kViewClassName;
|
|
}
|
|
|
|
void MenuBar::OnMenuButtonClicked(views::Button* source,
|
|
const gfx::Point& point,
|
|
const ui::Event* event) {
|
|
// Hide the accelerator when a submenu is activated.
|
|
SetAcceleratorVisibility(false);
|
|
|
|
if (!menu_model_)
|
|
return;
|
|
|
|
if (!window_->HasFocus())
|
|
window_->RequestFocus();
|
|
|
|
int id = source->tag();
|
|
AtomMenuModel::ItemType type = menu_model_->GetTypeAt(id);
|
|
if (type != AtomMenuModel::TYPE_SUBMENU) {
|
|
menu_model_->ActivatedAt(id, 0);
|
|
return;
|
|
}
|
|
|
|
GetFocusManager()->SetFocusedViewWithReason(
|
|
source, views::FocusManager::kReasonFocusTraversal);
|
|
|
|
// Deleted in MenuDelegate::OnMenuClosed
|
|
MenuDelegate* menu_delegate = new MenuDelegate(this);
|
|
menu_delegate->RunMenu(menu_model_->GetSubmenuModelAt(id), source,
|
|
event != nullptr && event->IsKeyEvent()
|
|
? ui::MENU_SOURCE_KEYBOARD
|
|
: ui::MENU_SOURCE_MOUSE);
|
|
menu_delegate->AddObserver(this);
|
|
}
|
|
|
|
void MenuBar::RefreshColorCache() {
|
|
const ui::NativeTheme* theme = GetNativeTheme();
|
|
if (theme) {
|
|
#if defined(USE_X11)
|
|
background_color_ = libgtkui::GetBgColor("GtkMenuBar#menubar");
|
|
enabled_color_ = libgtkui::GetFgColor(
|
|
"GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
|
|
disabled_color_ = libgtkui::GetFgColor(
|
|
"GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel");
|
|
#else
|
|
background_color_ =
|
|
theme->GetSystemColor(ui::NativeTheme::kColorId_MenuBackgroundColor);
|
|
#endif
|
|
}
|
|
#if defined(OS_WIN)
|
|
background_color_ = color_utils::GetSysSkColor(COLOR_MENUBAR);
|
|
#endif
|
|
}
|
|
|
|
void MenuBar::OnThemeChanged() {
|
|
RefreshColorCache();
|
|
UpdateViewColors();
|
|
}
|
|
|
|
void MenuBar::RebuildChildren() {
|
|
RemoveAllChildViews(true);
|
|
for (int i = 0, n = GetItemCount(); i < n; ++i) {
|
|
auto* button =
|
|
new SubmenuButton(menu_model_->GetLabelAt(i), this, background_color_);
|
|
button->set_tag(i);
|
|
AddChildView(button);
|
|
}
|
|
UpdateViewColors();
|
|
}
|
|
|
|
void MenuBar::UpdateViewColors() {
|
|
// set menubar background color
|
|
SetBackground(views::CreateSolidBackground(background_color_));
|
|
|
|
// set child colors
|
|
if (menu_model_ == nullptr)
|
|
return;
|
|
#if defined(USE_X11)
|
|
const auto& textColor = has_focus_ ? enabled_color_ : disabled_color_;
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
button->SetTextColor(views::Button::STATE_NORMAL, textColor);
|
|
button->SetTextColor(views::Button::STATE_DISABLED, disabled_color_);
|
|
button->SetTextColor(views::Button::STATE_PRESSED, enabled_color_);
|
|
button->SetTextColor(views::Button::STATE_HOVERED, textColor);
|
|
button->SetUnderlineColor(textColor);
|
|
}
|
|
#elif defined(OS_WIN)
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
|
|
}
|
|
#endif
|
|
}
|
|
|
|
} // namespace electron
|