716cb28430
* chore: bump chromium in DEPS to 1e9f9a24aa12bea9cf194a82a7e249bd1242ec4f * chore: update patches * Make WebContents' theme color a base::Optional<SkColor> https://chromium-review.googlesource.com/c/chromium/src/+/1540022 * update autofill patch for incorrect header includes * Move Shell messages to web_test and rename to BlinkTest. https://chromium-review.googlesource.com/c/chromium/src/+/1525181 * Make PlatformNotificationServiceImpl a KeyedService. https://chromium-review.googlesource.com/c/chromium/src/+/1336150 * Move MediaPlayerId to its own file. https://chromium-review.googlesource.com/c/chromium/src/+/1547057 * Remove net/base/completion_callback.h, which is no longer used https://chromium-review.googlesource.com/c/chromium/src/+/1552821 * AW NS: support file scheme cookies https://chromium-review.googlesource.com/c/chromium/src/+/1533486 * Remove SecurityInfo and adapt remaining consumers https://chromium-review.googlesource.com/c/chromium/src/+/1509455 * Remove deprecated type-specific number to string conversion functions https://chromium-review.googlesource.com/c/chromium/src/+/1545881 * DevTools: Adding new performance histograms for launch of top 4 tools https://chromium-review.googlesource.com/c/chromium/src/+/1506388 * Update include paths for //base/hash/hash.h https://chromium-review.googlesource.com/c/chromium/src/+/1544630 * build: Disable ensure_gn_version gclient hook for mac CI checkout * update patches * use maybe version of v8::String::NewFromTwoByte * bump appveyor image version * fix mac ci hopefully * Convert enum to enum class for MenuAnchorPosition https://chromium-review.googlesource.com/c/chromium/src/+/1530508 * use maybe version of ToObject * RenderViewHost::GetProcess is no longer const * Unrefcount AuthChallengeInfo https://chromium-review.googlesource.com/c/chromium/src/+/1550631 * MenuButtonController takes Button rather than MenuButton https://chromium-review.googlesource.com/c/chromium/src/+/1500935 * add //ui/views_bridge_mac to deps to fix link error * forward declare views::Button in atom::MenuDelegate * more v8 patches * base/{=> hash}/md5.h https://chromium-review.googlesource.com/c/chromium/src/+/1535124 * gfx::{PlatformFontWin => win}::* https://chromium-review.googlesource.com/c/chromium/src/+/1534178 * fix v8 patches * [base] Rename TaskScheduler to ThreadPool https://chromium-review.googlesource.com/c/chromium/src/+/1561552 * use internal_config_base for bytecode_builtins_list_generator avoids windows link errors * FIXME: temporarily disable v8/breakpad integration * FIXME: temporarily disable prevent-will-redirect test * FIXME: disable neon on aarch64 pending crbug.com/953815 * update to account for WebCursor refactor https://chromium-review.googlesource.com/c/chromium/src/+/1562755 * enable stack dumping on appveyor * Revert "FIXME: disable neon on aarch64 pending crbug.com/953815" This reverts commit 57f082026be3d83069f2a2814684abf4dc9e7b53. * fix: remove const qualifiers to match upstream * fix: remove const qualifiers to match upstream in cc files as well * don't throw an error when testing if an object is an object * use non-deprecated Buffer constructor * Remove net::CookieSameSite::DEFAULT_MODE enum value https://chromium-review.googlesource.com/c/chromium/src/+/1567955 * depend on modded dbus-native to work around buffer deprecation https://github.com/sidorares/dbus-native/pull/262 * revert clang roll to fix arm build on linux * fixup! depend on modded dbus-native to work around buffer deprecation need more coffee * update coffee-script * robustify verify-mksnapshot w.r.t. command-line parameters * Revert "robustify verify-mksnapshot w.r.t. command-line parameters" This reverts commit a49af01411f684f6025528d604895c3696e0bc57. * fix mksnapshot by matching args * update patches * TMP: enable rdp on appveyor * Changed ContentBrowserClient::CreateQuotaPermissionContext() to return scoped_refptr. https://chromium-review.googlesource.com/c/chromium/src/+/1569376 * Make content::ResourceType an enum class. https://chromium-review.googlesource.com/c/chromium/src/+/1569345 * fixup! Make content::ResourceType an enum class. * turn off rdp * use net::CompletionRepeatingCallback instead of base::Callback<void(int)> * remove disable_ensure_gn_version_gclient_hook.patch * copy repeating callback instead of std::move * fix lint * add completion_repeating_callback.h include
350 lines
11 KiB
C++
350 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 "atom/browser/ui/views/menu_bar.h"
|
|
|
|
#include <memory>
|
|
#include <set>
|
|
#include <sstream>
|
|
|
|
#include "atom/browser/ui/views/submenu_button.h"
|
|
#include "atom/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 atom {
|
|
|
|
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::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 =
|
|
atom::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
|
|
// atom::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 =
|
|
atom::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 =
|
|
atom::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) {
|
|
if (!theme)
|
|
theme = ui::NativeTheme::GetInstanceForNativeUi();
|
|
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::OnNativeThemeChanged(const ui::NativeTheme* theme) {
|
|
RefreshColorCache(theme);
|
|
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 atom
|