28ada6ea8b
* chore: bump chromium in DEPS to 99.0.4819.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4824.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4827.0
* chore: update patches
* 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons
https://chromium-review.googlesource.com/c/chromium/src/+/3352511
* 3309164: webhid: Show FIDO devices in the chooser if allowed
https://chromium-review.googlesource.com/c/chromium/src/+/3309164
* 3297868: hid: Add experimental HIDDevice.forget()
https://chromium-review.googlesource.com/c/chromium/src/+/3297868
* 3362491: [Extensions] Move i18n API to //extensions
https://chromium-review.googlesource.com/c/chromium/src/+/3362491
* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.
https://chromium-review.googlesource.com/c/chromium/src/+/3281481
* 3352616: [Gtk] Remove libgtk from the link-line
https://chromium-review.googlesource.com/c/chromium/src/+/3352616
* 3249211: Clear-Site-Data support for partitioned cookies
https://chromium-review.googlesource.com/c/chromium/src/+/3249211
* [Extensions][COIL] Use [allow|block]list in //extensions/common
https://chromium-review.googlesource.com/c/chromium/src/+/3372668
* Begin ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3376154
* [Code Health] Refactor PrefService GetDict + GetList to use base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3343526
* 3354997: [CodeHealth] Remove deprecated SetDictionary method
https://chromium-review.googlesource.com/c/chromium/src/+/3354997
* 3287323: Add LacrosPrefStore for lacros settings
https://chromium-review.googlesource.com/c/chromium/src/+/3287323
* 3365916: [PA] Clean up remaining lazy commit code
https://chromium-review.googlesource.com/c/chromium/src/+/3365916
* [MPArch] Target the external protocol error at the responsible frame.
https://chromium-review.googlesource.com/c/chromium/src/+/3011560
* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories
https://chromium-review.googlesource.com/c/chromium/src/+/3350608
* Linux: Send OSCrypt raw encryption key to the Network Service
https://chromium-review.googlesource.com/c/chromium/src/+/3320484
* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.
https://chromium-review.googlesource.com/c/chromium/src/+/3359441
* chore: fixup for lint
* 3327621: Fix tablet mode detection for Win 11.
https://chromium-review.googlesource.com/c/chromium/src/+/3327621
* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella
https://chromium-review.googlesource.com/c/chromium/src/+/3342428
* 3353974: Mac: Use base::Feature for overlay features
https://chromium-review.googlesource.com/c/chromium/src/+/3353974
* chore: bump chromium in DEPS to 99.0.4828.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4837.0
* chore: update patches
* chore: update patches
* 3379142: Drop FALLTHROUGH macro
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3379142
* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3381749
* chore: bump chromium in DEPS to 99.0.4839.0
* chore: update patches
* chore: bump chromium in DEPS to 99.0.4840.0
* chore: bump chromium in DEPS to 99.0.4844.0
* 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext()
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3395881
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4845.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4847.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4849.0
* chore: update patches
* chore: bump chromium in DEPS to 100.0.4851.0
* chore: bump chromium in DEPS to 100.0.4853.0
* update patches
* chore: update patches
* update patches
* 3383599: Fonts Access: Remove prototype that uses a font picker.
https://chromium-review.googlesource.com/c/chromium/src/+/3383599
* 3404768: Remove ALLOW_UNUSED macros
https://chromium-review.googlesource.com/c/chromium/src/+/3404768
* 3374762: Remove ignore_result.h
https://chromium-review.googlesource.com/c/chromium/src/+/3374762
* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections
https://chromium-review.googlesource.com/c/chromium/src/+/3399305
* 3402210: [Extensions] Don't trigger unload event for already unloaded extension
https://chromium-review.googlesource.com/c/chromium/src/+/3402210
* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.
https://chromium-review.googlesource.com/c/chromium/src/+/3410912
* 3370428: Make the AuthSchemes policy support dynamic refresh
https://chromium-review.googlesource.com/c/chromium/src/+/3370428
* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value
https://chromium-review.googlesource.com/c/chromium/src/+/3407603
* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x11
https://chromium-review.googlesource.com/c/chromium/src/+/3378352
* 3370810: Delete chrome/service, AKA the Cloud Print service process.
https://chromium-review.googlesource.com/c/chromium/src/+/3370810
* chore: bump chromium in DEPS to 100.0.4855.0
* chore: update patches
* fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process.
* revert 3348007 to fix windows build
* 3318572: [Code health] Fix gn check errors in //extensions/browser:*
https://chromium-review.googlesource.com/c/chromium/src/+/3318572
* fix printing.patch
* fix iwyu issue
* 3408515: win: Make ShorcutOperation an enum class and modernize names
https://chromium-review.googlesource.com/c/chromium/src/+/3408515
* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc
https://chromium-review.googlesource.com/c/chromium/src/+/3388333
* fix windows build? i hope
* patch gn visibility of //ui/ozone/platform/x11
* missing include base/logging.h
* use BUILDFLAG for USE_NSS_CERTS
https://chromium-review.googlesource.com/c/chromium/src/+/3379123
* defined(OS_*) ==> BUILDFLAG(IS_*)
https://bugs.chromium.org/p/chromium/issues/detail?id=1234043
* fixup! 3404768: Remove ALLOW_UNUSED macros
* another attempt to fix windows build
* temporarily disable the custom scheme service worker test
https://github.com/electron/electron/issues/32664
* fix loading mv3 extensions
not sure what cl broke this unfort.
* fixup! 3404768: Remove ALLOW_UNUSED macros
* patch nan
https://chromium-review.googlesource.com/c/v8/v8/+/3395880
* fix node test
* fix nullptr in FindPdfFrame
* patch perfetto to fix build issue on win-ia32
bc44c3c753
* fix build for linux-x64-testing-no-run-as-node
* fix patch
* skip <webview>.capturePage() test
https://github.com/electron/electron/issues/32705
* test: fix failing tests of focus/blur events of WebContents (#32711)
* inherit stdio from app module test child processes
this prevents them from timing out due to full stdout buffers
* test to see if we can get better logs on windows ci
* try again for appveyor log things
* skip contentTracing tests on ia32
* ci: disable gpu compositing
* drop applied patch
* fix merge fail
* Revert "ci: disable gpu compositing"
This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec.
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
227 lines
6.4 KiB
C++
227 lines
6.4 KiB
C++
// Copyright (c) 2018 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/root_view.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "content/public/browser/native_web_keyboard_event.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/ui/views/menu_bar.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// The menu bar height in pixels.
|
|
#if BUILDFLAG(IS_WIN)
|
|
const int kMenuBarHeight = 20;
|
|
#else
|
|
const int kMenuBarHeight = 25;
|
|
#endif
|
|
|
|
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
|
|
|
|
RootView::RootView(NativeWindow* window)
|
|
: window_(window),
|
|
last_focused_view_tracker_(std::make_unique<views::ViewTracker>()) {
|
|
set_owned_by_client();
|
|
}
|
|
|
|
RootView::~RootView() = default;
|
|
|
|
void RootView::SetMenu(ElectronMenuModel* menu_model) {
|
|
if (menu_model == nullptr) {
|
|
// Remove accelerators
|
|
UnregisterAcceleratorsWithFocusManager();
|
|
// and menu bar.
|
|
SetMenuBarVisibility(false);
|
|
menu_bar_.reset();
|
|
return;
|
|
}
|
|
|
|
RegisterAcceleratorsWithFocusManager(menu_model);
|
|
|
|
// Do not show menu bar in frameless window.
|
|
if (!window_->has_frame())
|
|
return;
|
|
|
|
if (!menu_bar_) {
|
|
menu_bar_ = std::make_unique<MenuBar>(window_, this);
|
|
menu_bar_->set_owned_by_client();
|
|
if (!menu_bar_autohide_)
|
|
SetMenuBarVisibility(true);
|
|
}
|
|
|
|
menu_bar_->SetMenu(menu_model);
|
|
Layout();
|
|
}
|
|
|
|
bool RootView::HasMenu() const {
|
|
return !!menu_bar_;
|
|
}
|
|
|
|
int RootView::GetMenuBarHeight() const {
|
|
return kMenuBarHeight;
|
|
}
|
|
|
|
void RootView::SetAutoHideMenuBar(bool auto_hide) {
|
|
menu_bar_autohide_ = auto_hide;
|
|
}
|
|
|
|
bool RootView::IsMenuBarAutoHide() const {
|
|
return menu_bar_autohide_;
|
|
}
|
|
|
|
void RootView::SetMenuBarVisibility(bool visible) {
|
|
if (!window_->content_view() || !menu_bar_ || menu_bar_visible_ == visible)
|
|
return;
|
|
|
|
menu_bar_visible_ = visible;
|
|
if (visible) {
|
|
DCHECK_EQ(children().size(), 1ul);
|
|
AddChildView(menu_bar_.get());
|
|
} else {
|
|
DCHECK_EQ(children().size(), 2ul);
|
|
RemoveChildView(menu_bar_.get());
|
|
}
|
|
|
|
Layout();
|
|
}
|
|
|
|
bool RootView::IsMenuBarVisible() const {
|
|
return menu_bar_visible_;
|
|
}
|
|
|
|
void RootView::HandleKeyEvent(const content::NativeWebKeyboardEvent& event) {
|
|
if (!menu_bar_)
|
|
return;
|
|
|
|
// Show accelerator when "Alt" is pressed.
|
|
if (menu_bar_visible_ && IsAltKey(event))
|
|
menu_bar_->SetAcceleratorVisibility(
|
|
event.GetType() == blink::WebInputEvent::Type::kRawKeyDown);
|
|
|
|
// Show the submenu when "Alt+Key" is pressed.
|
|
if (event.GetType() == blink::WebInputEvent::Type::kRawKeyDown &&
|
|
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);
|
|
|
|
View* focused_view = GetFocusManager()->GetFocusedView();
|
|
last_focused_view_tracker_->SetView(focused_view);
|
|
menu_bar_->RequestFocus();
|
|
}
|
|
|
|
menu_bar_->ActivateAccelerator(event.windows_key_code);
|
|
return;
|
|
}
|
|
|
|
// Toggle the menu bar only when a single Alt is released.
|
|
if (event.GetType() == blink::WebInputEvent::Type::kRawKeyDown &&
|
|
IsAltKey(event)) {
|
|
// When a single Alt is pressed:
|
|
menu_bar_alt_pressed_ = true;
|
|
} else if (event.GetType() == blink::WebInputEvent::Type::kKeyUp &&
|
|
IsAltKey(event) && menu_bar_alt_pressed_) {
|
|
// When a single Alt is released right after a Alt is pressed:
|
|
menu_bar_alt_pressed_ = false;
|
|
if (menu_bar_autohide_)
|
|
SetMenuBarVisibility(!menu_bar_visible_);
|
|
|
|
View* focused_view = GetFocusManager()->GetFocusedView();
|
|
last_focused_view_tracker_->SetView(focused_view);
|
|
if (menu_bar_visible_) {
|
|
menu_bar_->RequestFocus();
|
|
// Show accelerators when menu bar is focused
|
|
menu_bar_->SetAcceleratorVisibility(true);
|
|
}
|
|
} else {
|
|
// When any other keys except single Alt have been pressed/released:
|
|
menu_bar_alt_pressed_ = false;
|
|
}
|
|
}
|
|
|
|
void RootView::RestoreFocus() {
|
|
View* last_focused_view = last_focused_view_tracker_->view();
|
|
if (last_focused_view) {
|
|
GetFocusManager()->SetFocusedViewWithReason(
|
|
last_focused_view,
|
|
views::FocusManager::FocusChangeReason::kFocusRestore);
|
|
}
|
|
if (menu_bar_autohide_)
|
|
SetMenuBarVisibility(false);
|
|
}
|
|
|
|
void RootView::ResetAltState() {
|
|
menu_bar_alt_pressed_ = false;
|
|
}
|
|
|
|
void RootView::Layout() {
|
|
if (!window_->content_view()) // Not ready yet.
|
|
return;
|
|
|
|
const auto menu_bar_bounds =
|
|
menu_bar_visible_ ? gfx::Rect(0, 0, size().width(), kMenuBarHeight)
|
|
: gfx::Rect();
|
|
if (menu_bar_)
|
|
menu_bar_->SetBoundsRect(menu_bar_bounds);
|
|
|
|
window_->content_view()->SetBoundsRect(
|
|
gfx::Rect(0, menu_bar_visible_ ? menu_bar_bounds.bottom() : 0,
|
|
size().width(), size().height() - menu_bar_bounds.height()));
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
void RootView::RegisterAcceleratorsWithFocusManager(
|
|
ElectronMenuModel* menu_model) {
|
|
if (!menu_model)
|
|
return;
|
|
// Clear previous accelerators.
|
|
UnregisterAcceleratorsWithFocusManager();
|
|
|
|
views::FocusManager* focus_manager = GetFocusManager();
|
|
// 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);
|
|
}
|
|
}
|
|
|
|
void RootView::UnregisterAcceleratorsWithFocusManager() {
|
|
views::FocusManager* focus_manager = GetFocusManager();
|
|
accelerator_table_.clear();
|
|
focus_manager->UnregisterAccelerators(this);
|
|
}
|
|
|
|
} // namespace electron
|