8798571a77
* chore: bump chromium in DEPS to 1f1c4d91f6eaa4a033ec8f499d63a0717f79a42a * viz: Do not apply white level scaling for RGBA fp16 HDR video https://chromium-review.googlesource.com/c/chromium/src/+/2296006 * Move WebPreferences to WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2263635 * Fix missing WeakPtr check in PreconnectManager https://chromium-review.googlesource.com/c/chromium/src/+/2309029 * Fixup swiftshader roll revision * Update patch indices * Move WebDeviceEmulationParams into common. https://chromium-review.googlesource.com/c/chromium/src/+/2303356 * Move EnableDisableDeviceEmulation to blink mojom messages https://chromium-review.googlesource.com/c/chromium/src/+/2303367 * PDF Viewer: Remove flag for two-up view https://chromium-review.googlesource.com/c/chromium/src/+/2311130 * Add mojom definition for DeviceEmulationParams. https://chromium-review.googlesource.com/c/chromium/src/+/2303491 * Remove ServiceWorkerContextWatcher from PaymentAppInstaller https://chromium-review.googlesource.com/c/chromium/src/+/2291186 * Loader: Move transferrable_url_loader.mojom into blink's mojom directory https://chromium-review.googlesource.com/c/chromium/src/+/2306123 * chore: bump chromium in DEPS to 4974f436479739025a90ebc2cc2e36d67ee1ac46 * mac: Work around Xcode 12b3 SDK bug https://chromium-review.googlesource.com/c/chromium/src/+/2315078 * Reland Update core items for macOS Big Sur. https://chromium-review.googlesource.com/c/chromium/src/+/2315162 * Update Swiftshader revision * mac/arm64: When cross-building the snapshot, use page size of the target ISA instead of the host. https://chromium-review.googlesource.com/c/v8/v8/+/2310575 * Update patch indices * Rename {,Non}ClientView::CanClose() to OnWindowCloseRequested() https://chromium-review.googlesource.com/c/chromium/src/+/2247838 * chore: bump chromium in DEPS to e9465d70d1dea539400f0fddad43358ea3c31d71 * chore: bump chromium in DEPS to bd5b71c5f20288eb26068a39ae6e0579566a51c5 * chore: bump chromium in DEPS to 786ee543048bd07d07c5ac50b7dbbdd6bdd8dcce * chore: bump chromium in DEPS to 34eb6ecbf2c5894b648900bf771a2a29de204798 * chore: bump chromium in DEPS to 567ff038d68e3adb8116a01eec863cdf34d775f5 * chore: bump chromium in DEPS to 340b45c8d4ceb2dd61969fc34e1928d3c46db48c * chore: update patches * chore: base::DeleteFile with two params is removed Should use base::DeleteFile and base::DeletePathRecursively when appropriate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2313376 * chore: add patch for NodePlatform::PostJob impl * chore: update patches * chore: extension file access is now instrumented Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2209995 * chore: implement SetWindowFrameInScreen in OSR RWHV Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2321409 * chore: NotifyUserActivation requires a type now This is just for a histogram thing and therefore it does not matter what we pass in Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2281303 * chore: update patches * chore: bump chromium in DEPS to cd570e6dd3dcb84463ac252b04e92ceb02d8400c * chore: update patches * chore: bump chromium in DEPS to 0187908a31866992b90c59719ac1d016328f6ee0 * chore: bump chromium in DEPS to 3c9df38c508f3dba26a75248beed4882ddfb98e9 * chore: bump chromium in DEPS to 1a47d3b9cee710bd3c958c4f2d8b205710df9d50 * chore: bump chromium in DEPS to baac93040d96abdab72d46dd034c60f86e108702 * chore: bump chromium in DEPS to 13836145f97299e636491de38064b78861c4fb2e * update patches * change OS_MACOSX -> OS_MAC Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=1105907 * patch: add header for ToExecutionContext in WebMessagePortConverter * chore: bump chromium in DEPS to 91ab9b6ac5d04dc034a03ad847fbfa8261328c2b * update patches * NeedToFireBeforeUnloadOrUnload -> NeedToFireBeforeUnloadOrUnloadEvents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2288711 * chore: bump chromium in DEPS to 290deb11f0e30cb1382fd8f8793d340560283c23 * update patches * add dragdrop header for autofill popup * int -> x11::Time * patch out accessibility private API use Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2330812 * remove usage of XEvent Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2317767 * trigger recalculation of WebPreferences before renderer initialization Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2263635 * chore: bump chromium in DEPS to 6bdb484583b99c96ef3388d0c2184326581b2d5a * chore: bump chromium in DEPS to 1eb2a79cde04fd5c8ae51b4d813e6521635269e5 * chore: bump chromium in DEPS to 3dc8e3c0f400e4ca9c0a63d7a39bd910997ad4c6 * chore: update patches * fixup! trigger recalculation of WebPreferences before renderer initialization * views: Make MenuButton and RadioButton default constructible https://chromium-review.googlesource.com/c/chromium/src/+/2339586 * chore: fix code style Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
340 lines
10 KiB
C++
340 lines
10 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/native_theme/common_theme.h"
|
|
#include "ui/views/background.h"
|
|
#include "ui/views/layout/box_layout.h"
|
|
#include "ui/views/widget/widget.h"
|
|
|
|
#if defined(USE_X11)
|
|
#include "ui/gtk/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() = default;
|
|
|
|
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(ElectronMenuModel* 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,
|
|
ElectronMenuModel** 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) == ElectronMenuModel::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::FocusChangeReason::kFocusTraversal);
|
|
return true;
|
|
case ui::VKEY_END:
|
|
GetFocusManager()->SetFocusedViewWithReason(
|
|
GetLastFocusableChild(),
|
|
views::FocusManager::FocusChangeReason::kFocusTraversal);
|
|
return true;
|
|
default: {
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
bool shifted = false;
|
|
auto keycode =
|
|
electron::KeyboardCodeFromCharCode(button->accelerator(), &shifted);
|
|
|
|
if (keycode == accelerator.key_code()) {
|
|
auto event = accelerator.ToKeyEvent();
|
|
ButtonPressed(button, 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) {
|
|
std::set<ui::KeyboardCode> reg;
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
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);
|
|
|
|
std::set<ui::KeyboardCode> unreg;
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
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::ButtonPressed(views::Button* source, 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();
|
|
ElectronMenuModel::ItemType type = menu_model_->GetTypeAt(id);
|
|
if (type != ElectronMenuModel::TYPE_SUBMENU) {
|
|
menu_model_->ActivatedAt(id, 0);
|
|
return;
|
|
}
|
|
|
|
// Deleted in MenuDelegate::OnMenuClosed
|
|
MenuDelegate* menu_delegate = new MenuDelegate(this);
|
|
menu_delegate->RunMenu(
|
|
menu_model_->GetSubmenuModelAt(id), source,
|
|
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_ = gtk::GetBgColor("GtkMenuBar#menubar");
|
|
enabled_color_ =
|
|
gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
|
|
disabled_color_ = gtk::GetFgColor(
|
|
"GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel");
|
|
#else
|
|
background_color_ =
|
|
ui::GetAuraColor(ui::NativeTheme::kColorId_MenuBackgroundColor, theme);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
void MenuBar::OnThemeChanged() {
|
|
views::AccessiblePaneView::OnThemeChanged();
|
|
RefreshColorCache();
|
|
UpdateViewColors();
|
|
}
|
|
|
|
void MenuBar::RebuildChildren() {
|
|
RemoveAllChildViews(true);
|
|
for (int i = 0, n = GetItemCount(); i < n; ++i) {
|
|
auto* button =
|
|
new SubmenuButton(this, menu_model_->GetLabelAt(i), 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
|