5c7579ab1c
* chore: bump chromium in DEPS to 121.0.6128.0 * build: update patches * refactor: remove instrumentation from extensions code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5002404 * refactor: modernization of tabs_api Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4997031 * fix: add RecordHover and RecordDrag handlers * build: add missing pdf files * chore: bump chromium in DEPS to 121.0.6129.0 * chore: bump chromium in DEPS to 121.0.6131.0 * chore: update patches * refactor: remove will_cause_resize from ExitFullscreen Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5031312 * chore: add missing std converter include Before these were being inferred as std::string implicitly, not anymore Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5029573 * chore: Unwrap UserScriptList from unique_ptrs Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5005198 * refactor: add PDF internal id into PDF stream info Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4876972 * refactor: add metadata to view classes Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4994885 * chore: run lint --fix * chore: update libc++ filenames * chore: clean up menubar * chore: update patches after main merge * 5010979: Replace base::WStringPiece usage with std::wstring_view | https://chromium-review.googlesource.com/c/chromium/src/+/5010979 * chore: bump chromium in DEPS to 121.0.6142.0 * chore: update patches * 4969574: Refactor NativeDesktopMediaList | https://chromium-review.googlesource.com/c/chromium/src/+/4969574 * 5031192: [blink] Create new blink test suite that doesn't create blink Isolate | https://chromium-review.googlesource.com/c/chromium/src/+/5031192 * chore: update v8/devtools patches * 5040722: [base] Replace MakeFixedFlatTreeSorted with tag type overloads | https://chromium-review.googlesource.com/c/chromium/src/+/5040722 * 5026474: Add --generate-pdf-document-outline | https://chromium-review.googlesource.com/c/chromium/src/+/5026474 * 5024297: Change parameter of CheckMediaAccessPermission from GURL to URL::Origin | https://chromium-review.googlesource.com/c/chromium/src/+/5024297 * 5034217: [RWS] Remove CanonicalCookie::IsSameParty method | https://chromium-review.googlesource.com/c/chromium/src/+/5034217 * 5037192: Rewrite usage of RenderFrame::GetRoutingID | https://chromium-review.googlesource.com/c/chromium/src/+/5037192 * 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * chore: bump chromium in DEPS to 121.0.6143.0 * chore: bump chromium in DEPS to 121.0.6145.0 * chore: update chromium patches * 5049986: Use std::unique_ptr for MenuItemView::submenu_ member. | https://chromium-review.googlesource.com/c/chromium/src/+/5049986 * 5041595: picture-in-picture: Add PictureInPictureOcclusionTracker | https://chromium-review.googlesource.com/c/chromium/src/+/5041595 * chore: update all patches * chore: bump chromium in DEPS to 121.0.6147.0 * chore: update patches * 5051069: Use base::FunctionRef for BrowserPluginGuestManager. | https://chromium-review.googlesource.com/c/chromium/src/+/5051069 * 5057330: [base] Remove base::Erase()/base::EraseIf() overloads for std::set | https://chromium-review.googlesource.com/c/chromium/src/+/5057330 * fixup! 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * 5017518: Remove PPAPI if NaCl is disabled | https://chromium-review.googlesource.com/c/chromium/src/+/5017518 * 5002232: [DevTools] Console Insights: move from build flag to Feature API | https://chromium-review.googlesource.com/c/chromium/src/+/5002232 * 4970322: [X11] Move utils into x11::Connection | https://chromium-review.googlesource.com/c/chromium/src/+/4970322 * 5048950: Let MenuModelAdapter::CreateMenu return a std::unique_ptr<>. | https://chromium-review.googlesource.com/c/chromium/src/+/5048950 * chore: update libcxx filenames * use Context::Scope in RunScriptsAtDocument{Start,End} * 4775128: content: Reuse CC instance for main frame navigations https://chromium-review.googlesource.com/c/chromium/src/+/4775128 * also wrap WebWorkerObserver::ContextWillDestroy with Context::Scope * set LIBCPP_HARDENING_MODE https://chromium-review.googlesource.com/c/chromium/src/+/5014271 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
274 lines
8 KiB
C++
274 lines
8 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 "shell/browser/native_window.h"
|
|
#include "shell/browser/ui/views/submenu_button.h"
|
|
#include "ui/color/color_provider.h"
|
|
#include "ui/native_theme/common_theme.h"
|
|
#include "ui/views/background.h"
|
|
#include "ui/views/layout/box_layout.h"
|
|
|
|
#if BUILDFLAG(IS_LINUX)
|
|
#include "ui/gtk/gtk_util.h" // nogncheck
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_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
|
|
|
|
MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
|
|
: background_color_(kDefaultColor), window_(window), root_view_(root_view) {
|
|
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
|
|
#if BUILDFLAG(IS_WIN)
|
|
SetBackground(views::CreateThemedSolidBackground(ui::kColorMenuBackground));
|
|
#endif
|
|
RefreshColorCache(theme);
|
|
UpdateViewColors();
|
|
SetFocusBehavior(FocusBehavior::ALWAYS);
|
|
SetLayoutManager(std::make_unique<views::BoxLayout>(
|
|
views::BoxLayout::Orientation::kHorizontal));
|
|
window_->AddObserver(this);
|
|
}
|
|
|
|
MenuBar::~MenuBar() {
|
|
window_->RemoveObserver(this);
|
|
}
|
|
|
|
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(char16_t key) {
|
|
if (key == 0)
|
|
return nullptr;
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
if (static_cast<SubmenuButton*>(child)->accelerator() == key)
|
|
return child;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
bool MenuBar::HasAccelerator(char16_t key) {
|
|
return FindAccelChild(key) != nullptr;
|
|
}
|
|
|
|
void MenuBar::ActivateAccelerator(char16_t key) {
|
|
auto* child = FindAccelChild(key);
|
|
if (child)
|
|
static_cast<SubmenuButton*>(child)->Activate(nullptr);
|
|
}
|
|
|
|
size_t 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 (size_t 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();
|
|
}
|
|
root_view_->RestoreFocus();
|
|
}
|
|
|
|
void MenuBar::OnMenuClosed() {
|
|
SetAcceleratorVisibility(pane_has_focus());
|
|
}
|
|
|
|
void MenuBar::OnWindowBlur() {
|
|
UpdateViewColors();
|
|
SetAcceleratorVisibility(pane_has_focus());
|
|
}
|
|
|
|
void MenuBar::OnWindowFocus() {
|
|
UpdateViewColors();
|
|
SetAcceleratorVisibility(pane_has_focus());
|
|
}
|
|
|
|
void MenuBar::GetAccessibleNodeData(ui::AXNodeData* node_data) {
|
|
node_data->SetNameExplicitlyEmpty();
|
|
node_data->role = ax::mojom::Role::kMenuBar;
|
|
}
|
|
|
|
bool MenuBar::AcceleratorPressed(const ui::Accelerator& accelerator) {
|
|
// Treat pressing Alt the same as pressing Esc.
|
|
const ui::Accelerator& translated =
|
|
accelerator.key_code() == ui::VKEY_MENU
|
|
? ui::Accelerator(ui::VKEY_ESCAPE, accelerator.modifiers(),
|
|
accelerator.key_state(), accelerator.time_stamp())
|
|
: accelerator;
|
|
bool result = views::AccessiblePaneView::AcceleratorPressed(translated);
|
|
if (result && !pane_has_focus())
|
|
root_view_->RestoreFocus();
|
|
return result;
|
|
}
|
|
|
|
bool MenuBar::SetPaneFocusAndFocusDefault() {
|
|
bool result = views::AccessiblePaneView::SetPaneFocusAndFocusDefault();
|
|
if (result && !accelerator_installed_) {
|
|
// Listen to Alt key events.
|
|
// Note that there is no need to unregister the accelerator.
|
|
accelerator_installed_ = true;
|
|
focus_manager()->RegisterAccelerator(
|
|
ui::Accelerator(ui::VKEY_MENU, ui::EF_ALT_DOWN),
|
|
ui::AcceleratorManager::kNormalPriority, this);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
void MenuBar::OnThemeChanged() {
|
|
views::AccessiblePaneView::OnThemeChanged();
|
|
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
|
|
RefreshColorCache(theme);
|
|
UpdateViewColors();
|
|
}
|
|
|
|
void MenuBar::OnDidChangeFocus(View* focused_before, View* focused_now) {
|
|
views::AccessiblePaneView::OnDidChangeFocus(focused_before, focused_now);
|
|
SetAcceleratorVisibility(pane_has_focus());
|
|
if (!pane_has_focus())
|
|
root_view_->RestoreFocus();
|
|
}
|
|
|
|
const char* MenuBar::GetClassName() const {
|
|
return kViewClassName;
|
|
}
|
|
|
|
void MenuBar::ButtonPressed(size_t id, const ui::Event& event) {
|
|
// Hide the accelerator when a submenu is activated.
|
|
SetAcceleratorVisibility(pane_has_focus());
|
|
|
|
if (!menu_model_)
|
|
return;
|
|
|
|
if (!root_view_->HasFocus())
|
|
root_view_->RequestFocus();
|
|
|
|
ElectronMenuModel::ItemType type = menu_model_->GetTypeAt(id);
|
|
if (type != ElectronMenuModel::TYPE_SUBMENU) {
|
|
menu_model_->ActivatedAt(id, 0);
|
|
return;
|
|
}
|
|
|
|
SubmenuButton* source = nullptr;
|
|
for (auto* child : children()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
int button_id = button->GetID();
|
|
if (button_id >= 0 && static_cast<size_t>(button_id) == id) {
|
|
source = button;
|
|
break;
|
|
}
|
|
}
|
|
DCHECK(source);
|
|
|
|
// Deleted in MenuDelegate::OnMenuClosed
|
|
auto* 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::ViewHierarchyChanged(
|
|
const views::ViewHierarchyChangedDetails& details) {
|
|
views::AccessiblePaneView::ViewHierarchyChanged(details);
|
|
#if BUILDFLAG(IS_WIN)
|
|
background_color_ = GetBackground()->get_color();
|
|
#endif
|
|
}
|
|
|
|
void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
|
|
if (theme) {
|
|
#if BUILDFLAG(IS_LINUX)
|
|
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");
|
|
#elif BUILDFLAG(IS_WIN)
|
|
background_color_ = GetBackground()->get_color();
|
|
#endif
|
|
}
|
|
}
|
|
|
|
void MenuBar::RebuildChildren() {
|
|
RemoveAllChildViews();
|
|
for (size_t i = 0, n = GetItemCount(); i < n; ++i) {
|
|
auto* button = new SubmenuButton(
|
|
base::BindRepeating(&MenuBar::ButtonPressed, base::Unretained(this), i),
|
|
menu_model_->GetLabelAt(i), background_color_);
|
|
button->SetID(i);
|
|
AddChildView(button);
|
|
}
|
|
UpdateViewColors();
|
|
}
|
|
|
|
void MenuBar::UpdateViewColors() {
|
|
#if BUILDFLAG(IS_LINUX)
|
|
// set menubar background color
|
|
SetBackground(views::CreateSolidBackground(background_color_));
|
|
#endif
|
|
|
|
// set child colors
|
|
if (menu_model_ == nullptr)
|
|
return;
|
|
#if BUILDFLAG(IS_LINUX)
|
|
const auto& textColor =
|
|
window_->IsFocused() ? 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 BUILDFLAG(IS_WIN)
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
|
|
}
|
|
#endif
|
|
}
|
|
|
|
BEGIN_METADATA(MenuBar)
|
|
END_METADATA
|
|
|
|
} // namespace electron
|