2018-05-01 04:28:22 +00:00
|
|
|
// Copyright (c) 2018 GitHub, Inc.
|
|
|
|
// Use of this source code is governed by the MIT license that can be
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
2019-06-19 20:46:59 +00:00
|
|
|
#include "shell/browser/ui/views/root_view.h"
|
2018-05-01 04:28:22 +00:00
|
|
|
|
2019-09-16 22:12:00 +00:00
|
|
|
#include <memory>
|
|
|
|
|
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894
No logic changes, but patch needed to be manually re-applied due to upstream code shear
* chore: update port_autofill_colors_to_the_color_pipeline.patch
No manual changes; patch applied with fuzz
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5953.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5955.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5957.0
* chore: update patches
* chore: include path of native_web_keyboard_event.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
* chore: remove reference to eextensions/browser/notification-types.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627
* chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code?
* chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198
* chore: add auto_pip_setting_helper.[cc,h] to chromium_src build
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277
Exiting upstream code used by chromium_src now depends on this new upstream class
* chore: bump chromium in DEPS to 118.0.5959.0
* chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
manually adjust patch to minor upstream chagnes
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5961.0
* chore: bump chromium in DEPS to 118.0.5963.0
* chore: update patches
* 4780994: Rename various base files to "apple" since iOS uses them too
https://chromium-review.googlesource.com/c/chromium/src/+/4780994
* Many files moved from `mac` -> `apple`
This commit follows a handful of CLs that simply rename files/symbols to change `mac`
to `apple`
to signify their use across both macOS and iOS:
- 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header
- 4790744: Move foundation_util to base/apple, leave a forwarding header
- 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header
- 4787627: Move and rename macOS+iOS base/ files in PA to "apple"
- 4780399: Move OSStatus logging to base/apple
- 4787387: Remove forwarding headers
- 4781113: Rename message_pump_mac to "apple" because iOS uses it too
* fixup minor patch update error
A function param got dropped from this patch somewhere earlier
* chore: bump chromium in DEPS to 118.0.5965.2
* chore: update patches
* 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple::
https://chromium-review.googlesource.com/c/chromium/src/+/4799213
* Fix removed include to BrowserContext
In crrev.com/c/4767962 an include to BrowserContext was removed,
which was necessary for compilation. This broke only for us because
"chrome/browser/profiles/profile.h" includes that class, but we remove
all references to profiles.
* chore: bump chromium in DEPS to 118.0.5967.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5969.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5971.0
* chore: bump chromium in DEPS to 118.0.5973.0
* chore: update patches
* 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper
https://chromium-review.googlesource.com/c/chromium/src/+/4772121
* 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate.
https://chromium-review.googlesource.com/c/chromium/src/+/4811164
* 4809488: Remove duplicate dnd functionality between Web and Renderer prefs
https://chromium-review.googlesource.com/c/chromium/src/+/4809488
Given that this is no longer an option of web preferences, we should
consider deprecating this option and then removing it.
* chore: bump chromium in DEPS to 118.0.5975.0
* chore: update patches
* fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build
* Reland "[windows] Remove RegKey::DeleteEmptyKey"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255
* Ensure StrCat means StrCat
Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180
* fixup! Remove RegKey::DeleteEmptyKey
* Consistently reject large p and large q in DH
Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226
---------
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: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-09-01 06:54:59 +00:00
|
|
|
#include "content/public/common/input/native_web_keyboard_event.h"
|
2019-06-19 20:46:59 +00:00
|
|
|
#include "shell/browser/native_window.h"
|
|
|
|
#include "shell/browser/ui/views/menu_bar.h"
|
2024-04-08 17:30:23 +00:00
|
|
|
#include "ui/views/layout/box_layout.h"
|
2018-05-01 04:28:22 +00:00
|
|
|
|
2019-06-19 21:23:04 +00:00
|
|
|
namespace electron {
|
2018-05-01 04:28:22 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
bool IsAltKey(const content::NativeWebKeyboardEvent& event) {
|
|
|
|
return event.windows_key_code == ui::VKEY_MENU;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool IsAltModifier(const content::NativeWebKeyboardEvent& event) {
|
|
|
|
typedef content::NativeWebKeyboardEvent::Modifiers Modifiers;
|
|
|
|
int modifiers = event.GetModifiers();
|
|
|
|
modifiers &= ~Modifiers::kNumLockOn;
|
|
|
|
modifiers &= ~Modifiers::kCapsLockOn;
|
|
|
|
return (modifiers == Modifiers::kAltKey) ||
|
|
|
|
(modifiers == (Modifiers::kAltKey | Modifiers::kIsLeft)) ||
|
|
|
|
(modifiers == (Modifiers::kAltKey | Modifiers::kIsRight));
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
2018-10-29 18:08:47 +00:00
|
|
|
RootView::RootView(NativeWindow* window)
|
|
|
|
: window_(window),
|
|
|
|
last_focused_view_tracker_(std::make_unique<views::ViewTracker>()) {
|
2018-05-01 04:28:22 +00:00
|
|
|
set_owned_by_client();
|
2024-04-08 17:30:23 +00:00
|
|
|
views::BoxLayout* layout =
|
|
|
|
SetLayoutManager(std::make_unique<views::BoxLayout>(
|
|
|
|
views::BoxLayout::Orientation::kVertical));
|
|
|
|
main_view_ = AddChildView(std::make_unique<views::View>());
|
|
|
|
main_view_->SetUseDefaultFillLayout(true);
|
|
|
|
layout->SetFlexForView(main_view_, 1);
|
2018-05-01 04:28:22 +00:00
|
|
|
}
|
|
|
|
|
2019-09-16 22:12:00 +00:00
|
|
|
RootView::~RootView() = default;
|
2018-05-01 04:28:22 +00:00
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
void RootView::SetMenu(ElectronMenuModel* menu_model) {
|
2018-05-01 04:28:22 +00:00
|
|
|
if (menu_model == nullptr) {
|
|
|
|
// Remove accelerators
|
2018-11-09 21:54:16 +00:00
|
|
|
UnregisterAcceleratorsWithFocusManager();
|
2018-05-01 04:28:22 +00:00
|
|
|
// and menu bar.
|
|
|
|
SetMenuBarVisibility(false);
|
|
|
|
menu_bar_.reset();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-11-09 21:54:16 +00:00
|
|
|
RegisterAcceleratorsWithFocusManager(menu_model);
|
2018-05-01 04:28:22 +00:00
|
|
|
|
|
|
|
// Do not show menu bar in frameless window.
|
|
|
|
if (!window_->has_frame())
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!menu_bar_) {
|
2021-05-21 17:00:47 +00:00
|
|
|
menu_bar_ = std::make_unique<MenuBar>(window_, this);
|
2018-05-01 04:28:22 +00:00
|
|
|
menu_bar_->set_owned_by_client();
|
|
|
|
if (!menu_bar_autohide_)
|
|
|
|
SetMenuBarVisibility(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
menu_bar_->SetMenu(menu_model);
|
2024-02-14 17:33:32 +00:00
|
|
|
InvalidateLayout();
|
2018-05-01 04:28:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool RootView::HasMenu() const {
|
|
|
|
return !!menu_bar_;
|
|
|
|
}
|
|
|
|
|
|
|
|
int RootView::GetMenuBarHeight() const {
|
2024-04-08 17:30:23 +00:00
|
|
|
return menu_bar_ ? menu_bar_->GetPreferredSize().height() : 0;
|
2018-05-01 04:28:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void RootView::SetAutoHideMenuBar(bool auto_hide) {
|
|
|
|
menu_bar_autohide_ = auto_hide;
|
|
|
|
}
|
|
|
|
|
|
|
|
void RootView::SetMenuBarVisibility(bool visible) {
|
2018-05-08 06:24:53 +00:00
|
|
|
if (!window_->content_view() || !menu_bar_ || menu_bar_visible_ == visible)
|
2018-05-01 04:28:22 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
menu_bar_visible_ = visible;
|
|
|
|
if (visible) {
|
2024-04-08 17:30:23 +00:00
|
|
|
AddChildViewAt(menu_bar_.get(), 0);
|
2018-05-01 04:28:22 +00:00
|
|
|
} else {
|
|
|
|
RemoveChildView(menu_bar_.get());
|
|
|
|
}
|
|
|
|
|
2024-02-14 17:33:32 +00:00
|
|
|
InvalidateLayout();
|
2018-05-01 04:28:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void RootView::HandleKeyEvent(const content::NativeWebKeyboardEvent& event) {
|
|
|
|
if (!menu_bar_)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Show accelerator when "Alt" is pressed.
|
|
|
|
if (menu_bar_visible_ && IsAltKey(event))
|
2020-05-26 20:06:26 +00:00
|
|
|
menu_bar_->SetAcceleratorVisibility(
|
|
|
|
event.GetType() == blink::WebInputEvent::Type::kRawKeyDown);
|
2018-05-01 04:28:22 +00:00
|
|
|
|
|
|
|
// Show the submenu when "Alt+Key" is pressed.
|
2020-05-26 20:06:26 +00:00
|
|
|
if (event.GetType() == blink::WebInputEvent::Type::kRawKeyDown &&
|
2021-06-01 01:48:52 +00:00
|
|
|
event.windows_key_code >= ui::VKEY_A &&
|
|
|
|
event.windows_key_code <= ui::VKEY_Z && IsAltModifier(event) &&
|
|
|
|
menu_bar_->HasAccelerator(event.windows_key_code)) {
|
|
|
|
if (!menu_bar_visible_) {
|
|
|
|
SetMenuBarVisibility(true);
|
2018-05-01 04:28:22 +00:00
|
|
|
|
2021-06-01 01:48:52 +00:00
|
|
|
View* focused_view = GetFocusManager()->GetFocusedView();
|
|
|
|
last_focused_view_tracker_->SetView(focused_view);
|
|
|
|
menu_bar_->RequestFocus();
|
2018-10-29 18:08:47 +00:00
|
|
|
}
|
2021-06-01 01:48:52 +00:00
|
|
|
|
|
|
|
menu_bar_->ActivateAccelerator(event.windows_key_code);
|
2018-05-01 04:28:22 +00:00
|
|
|
return;
|
2018-10-29 18:08:47 +00:00
|
|
|
}
|
2018-05-01 04:28:22 +00:00
|
|
|
|
|
|
|
// Toggle the menu bar only when a single Alt is released.
|
2020-05-26 20:06:26 +00:00
|
|
|
if (event.GetType() == blink::WebInputEvent::Type::kRawKeyDown &&
|
|
|
|
IsAltKey(event)) {
|
2018-05-01 04:28:22 +00:00
|
|
|
// When a single Alt is pressed:
|
|
|
|
menu_bar_alt_pressed_ = true;
|
2020-05-26 20:06:26 +00:00
|
|
|
} else if (event.GetType() == blink::WebInputEvent::Type::kKeyUp &&
|
2018-05-01 04:28:22 +00:00
|
|
|
IsAltKey(event) && menu_bar_alt_pressed_) {
|
|
|
|
// When a single Alt is released right after a Alt is pressed:
|
|
|
|
menu_bar_alt_pressed_ = false;
|
2018-10-29 18:08:47 +00:00
|
|
|
if (menu_bar_autohide_)
|
|
|
|
SetMenuBarVisibility(!menu_bar_visible_);
|
|
|
|
|
|
|
|
View* focused_view = GetFocusManager()->GetFocusedView();
|
|
|
|
last_focused_view_tracker_->SetView(focused_view);
|
2019-04-15 17:54:27 +00:00
|
|
|
if (menu_bar_visible_) {
|
|
|
|
menu_bar_->RequestFocus();
|
|
|
|
// Show accelerators when menu bar is focused
|
|
|
|
menu_bar_->SetAcceleratorVisibility(true);
|
|
|
|
}
|
2018-05-01 04:28:22 +00:00
|
|
|
} else {
|
|
|
|
// When any other keys except single Alt have been pressed/released:
|
|
|
|
menu_bar_alt_pressed_ = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-29 18:08:47 +00:00
|
|
|
void RootView::RestoreFocus() {
|
|
|
|
View* last_focused_view = last_focused_view_tracker_->view();
|
|
|
|
if (last_focused_view) {
|
|
|
|
GetFocusManager()->SetFocusedViewWithReason(
|
2019-08-24 01:14:23 +00:00
|
|
|
last_focused_view,
|
|
|
|
views::FocusManager::FocusChangeReason::kFocusRestore);
|
2018-10-29 18:08:47 +00:00
|
|
|
}
|
|
|
|
if (menu_bar_autohide_)
|
|
|
|
SetMenuBarVisibility(false);
|
|
|
|
}
|
|
|
|
|
2018-05-01 04:28:22 +00:00
|
|
|
void RootView::ResetAltState() {
|
|
|
|
menu_bar_alt_pressed_ = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
gfx::Size RootView::GetMinimumSize() const {
|
|
|
|
return window_->GetMinimumSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
gfx::Size RootView::GetMaximumSize() const {
|
|
|
|
return window_->GetMaximumSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool RootView::AcceleratorPressed(const ui::Accelerator& accelerator) {
|
|
|
|
return accelerator_util::TriggerAcceleratorTableCommand(&accelerator_table_,
|
|
|
|
accelerator);
|
|
|
|
}
|
|
|
|
|
2020-02-04 20:19:40 +00:00
|
|
|
void RootView::RegisterAcceleratorsWithFocusManager(
|
|
|
|
ElectronMenuModel* menu_model) {
|
2018-11-09 21:54:16 +00:00
|
|
|
if (!menu_model)
|
|
|
|
return;
|
2018-05-01 04:28:22 +00:00
|
|
|
// Clear previous accelerators.
|
2018-11-09 21:54:16 +00:00
|
|
|
UnregisterAcceleratorsWithFocusManager();
|
2018-05-01 04:28:22 +00:00
|
|
|
|
2018-11-09 21:54:16 +00:00
|
|
|
views::FocusManager* focus_manager = GetFocusManager();
|
2018-05-01 04:28:22 +00:00
|
|
|
// Register accelerators with focus manager.
|
|
|
|
accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);
|
|
|
|
for (const auto& iter : accelerator_table_) {
|
|
|
|
focus_manager->RegisterAccelerator(
|
|
|
|
iter.first, ui::AcceleratorManager::kNormalPriority, this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-09 21:54:16 +00:00
|
|
|
void RootView::UnregisterAcceleratorsWithFocusManager() {
|
|
|
|
views::FocusManager* focus_manager = GetFocusManager();
|
|
|
|
accelerator_table_.clear();
|
|
|
|
focus_manager->UnregisterAccelerators(this);
|
|
|
|
}
|
|
|
|
|
2019-06-19 21:23:04 +00:00
|
|
|
} // namespace electron
|