5513e66982
* chore: bump chromium in DEPS to 94.0.4604.0 * build: 3-way merge of chromium patches * chore: bump chromium in DEPS to 94.0.4605.0 * build: 3-way merge of chromium patches * 3076040: Reland Remove delete_children RemoveAllChildViews arg Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3076040 * 3069287: Remove the remaining uses and delete the deprecated API Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3069287 * 2297212: Replace RemoveWithoutPathExpansion(.*, nullptr) with Value::RemoveKey() Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2297212 Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 * 3082756: Change transport_security_persister_path param to be a path to a file. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3082756 > this CL intentionally changes the name of the parameter > in the network context parameters and the order of the constructor > parameters to ensure all callers update their code to pass a full > file path rather than a path to a directory. The 'path' in this diff is already an absolute path, coming from `CHECK(base::PathService::Get(chrome::DIR_USER_DATA, &path_));` at08ff1c2cbf/shell/browser/electron_browser_context.cc (L126)
* iwyu: network::mojom::HttpRawHeaderPair * fixup! 3076040: Reland Remove delete_children RemoveAllChildViews arg Missed one. * 2999884: CodeHealth: Remove DictionaryValue::GetStringWithoutPathExpansion Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2999884 (example of replacing GetStringWithoutPathExpansion() w/FindStringKey()) Also: https://chromium-review.googlesource.com/c/chromium/src/+/3060296 (removal of DictionaryValue::GetStringWithoutPathExpansion) * 3059260: Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3059260 We had both of these in a 'disable_features' list. Since these feature have been removed upstream, remove them from our disable list, too. IMPORTANT: this commit should not be backported to older branches that still have these features, because doing so would un-disable them. * 2920890: Load reroute_info from download in-progress and history db back into DownloadItem. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2920890 * 3039323: [Clipboard API] Clipboard Custom Formats implementation Part 5. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * chore: bump chromium in DEPS to 94.0.4606.0 * 3084502: Add a new PrintRasterizePdfDpi policy. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 94.0.4606.3 * chore: bump chromium in DEPS to 95.0.4608.0 * chore: bump chromium in DEPS to 95.0.4609.0 * [DevTools] Remove report_raw_headers from network::ResourceRequest https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * Remove content::WebContentsObserver::OnInterfaceRequestFromFrame https://chromium-review.googlesource.com/c/chromium/src/+/3092665 * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * Add a new PrintRasterizePdfDpi policy. https://chromium-review.googlesource.com/c/chromium/src/+/3084502 * chore: update patches * chore: bump chromium in DEPS to 95.0.4609.3 * disable `use_lld` for macos * chore: update patches * Linux: use chrome_crashpad_handler instead of crashpad_handler https://chromium-review.googlesource.com/c/chromium/src/+/3054290 * chore: fix lint * Revert "[DevTools] Remove report_raw_headers from network::ResourceRequest" This reverts commit 28f4da1582d046e96cb58f3cbb590503e89dfd0d. * [DevTools] Remove report_raw_headers from network::ResourceRequest (Attempt #2) https://chromium-review.googlesource.com/c/chromium/src/+/2856099 * DCHECK that predictor always has a non-empty NetworkIsolationKey. https://chromium-review.googlesource.com/c/chromium/src/+/3067698 * Remove --no-untrusted-code-mitigations from //content and //gin https://chromium-review.googlesource.com/c/chromium/src/+/3096585 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure https://chromium-review.googlesource.com/c/chromium/src/+/3059260 * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Convert PrintManager to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3072019 * chore: bump chromium in DEPS to 95.0.4612.5 * chore: disable v8 oilpan * [Compiler] Remove untrusted code mitigations. https://chromium-review.googlesource.com/c/v8/v8/+/3045704 * Remove most FTP logic from services/network. https://chromium-review.googlesource.com/c/chromium/src/+/3076119 * Rename scale_factor.h -> resource_scale_factor.h https://chromium-review.googlesource.com/c/chromium/src/+/3057113 * [GURL -> SiteForCookies] extensions/ https://chromium-review.googlesource.com/c/chromium/src/+/3100825 * breadcrumbs: add desktop entry point https://chromium-review.googlesource.com/c/chromium/src/+/3021746 * Move args_ to private in ExtensionFunction https://chromium-review.googlesource.com/c/chromium/src/+/3076261 * chore: iwyu * fixup! Remove kSameSiteByDefaultCookies and kCookiesWithoutSameSiteMustBeSecure * Disable kDesktopCaptureMacV2 https://chromium-review.googlesource.com/c/chromium/src/+/3069272 * fixup! [Compiler] Remove untrusted code mitigations. * fixup! Disable kDesktopCaptureMacV2 * Revert "chore: disable v8 oilpan" This reverts commit 5d255cf1d8e8efbb906047937a713279e5f800d0. * Reland "chore: disable v8 oilpan" This reverts commit 1c252765b07a205560e7b5eed06de2605336e2d8. The previous revert was to test on which platforms did the heapsnapshot test actually fail. * [Clipboard API] Clipboard Custom Formats implementation Part 5. https://chromium-review.googlesource.com/c/chromium/src/+/3039323 * Convert ExtensionFrameHost to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3063358 * Convert PDFWebContentsHelper to RenderFrameHostReceiverSet. https://chromium-review.googlesource.com/c/chromium/src/+/3049751 * [Underscore Migration] Migrate ui/legacy https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/3093160 * chore: remove unknown permission error * chore: fix lint * chore: ignore -Wunreachable-code-return for node deps/ * fixup! chore: ignore -Wunreachable-code-return for node deps/ * fix: windows build * fix: build dependency Dependency was missed incbeae20438
* 3108669: arm,dsp: Fix 8bpp Dct64_NEON(). https://chromium-review.googlesource.com/c/codecs/libgav1/+/3108669 * chore: revert libgav1 roll * Revert "3108669: arm,dsp: Fix 8bpp Dct64_NEON()." This reverts commit 7ed31323127aac8ba2eaff9cae6c9be9a4954f33. * Revert "chore: revert libgav1 roll" This reverts commit 084a490d298811267316c786762fe7aa91b6318d. * chore: revert clang roll * chore: Fix -Wunreachable-code-aggressive warnings in arm and arm64 code Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: mlaurencin <mlaurencin@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
258 lines
7.4 KiB
C++
258 lines
7.4 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/native_theme/common_theme.h"
|
|
#include "ui/views/background.h"
|
|
#include "ui/views/layout/box_layout.h"
|
|
|
|
#if defined(OS_LINUX)
|
|
#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";
|
|
|
|
MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
|
|
: background_color_(kDefaultColor), window_(window), root_view_(root_view) {
|
|
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
|
|
if (theme) {
|
|
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);
|
|
}
|
|
|
|
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();
|
|
}
|
|
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());
|
|
}
|
|
|
|
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();
|
|
if (theme) {
|
|
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(int 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);
|
|
if (button->tag() == 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::RefreshColorCache(const ui::NativeTheme* theme) {
|
|
if (theme) {
|
|
#if defined(OS_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");
|
|
#else
|
|
background_color_ =
|
|
ui::GetAuraColor(ui::NativeTheme::kColorId_MenuBackgroundColor, theme);
|
|
#endif
|
|
}
|
|
}
|
|
|
|
void MenuBar::RebuildChildren() {
|
|
RemoveAllChildViews();
|
|
for (int 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->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(OS_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 defined(OS_WIN)
|
|
for (auto* child : GetChildrenInZOrder()) {
|
|
auto* button = static_cast<SubmenuButton*>(child);
|
|
button->SetUnderlineColor(color_utils::GetSysSkColor(COLOR_MENUTEXT));
|
|
}
|
|
#endif
|
|
}
|
|
|
|
} // namespace electron
|