![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
202 lines
6 KiB
C++
202 lines
6 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 "components/input/native_web_keyboard_event.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/ui/views/menu_bar.h"
|
|
#include "ui/views/layout/box_layout.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
bool IsAltKey(const input::NativeWebKeyboardEvent& event) {
|
|
return event.windows_key_code == ui::VKEY_MENU;
|
|
}
|
|
|
|
bool IsAltModifier(const input::NativeWebKeyboardEvent& event) {
|
|
using Modifiers = input::NativeWebKeyboardEvent::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_{raw_ref<NativeWindow>::from_ptr(window)},
|
|
main_view_{raw_ref<views::View>::from_ptr(
|
|
AddChildView(std::make_unique<views::View>()))} {
|
|
set_owned_by_client(OwnedByClientPassKey{});
|
|
views::BoxLayout* layout =
|
|
SetLayoutManager(std::make_unique<views::BoxLayout>(
|
|
views::BoxLayout::Orientation::kVertical));
|
|
main_view_->SetUseDefaultFillLayout(true);
|
|
layout->SetFlexForView(&main_view_.get(), 1);
|
|
}
|
|
|
|
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_.get(), this);
|
|
menu_bar_->set_owned_by_client(OwnedByClientPassKey{});
|
|
if (!menu_bar_autohide_)
|
|
SetMenuBarVisibility(true);
|
|
}
|
|
|
|
menu_bar_->SetMenu(menu_model);
|
|
InvalidateLayout();
|
|
}
|
|
|
|
bool RootView::HasMenu() const {
|
|
return !!menu_bar_;
|
|
}
|
|
|
|
int RootView::GetMenuBarHeight() const {
|
|
return menu_bar_ ? menu_bar_->GetPreferredSize().height() : 0;
|
|
}
|
|
|
|
void RootView::SetAutoHideMenuBar(bool auto_hide) {
|
|
menu_bar_autohide_ = auto_hide;
|
|
}
|
|
|
|
void RootView::SetMenuBarVisibility(bool visible) {
|
|
if (!window_->content_view() || !menu_bar_ || menu_bar_visible_ == visible)
|
|
return;
|
|
|
|
menu_bar_visible_ = visible;
|
|
if (visible) {
|
|
AddChildViewAt(menu_bar_.get(), 0);
|
|
} else {
|
|
RemoveChildView(menu_bar_.get());
|
|
}
|
|
|
|
InvalidateLayout();
|
|
}
|
|
|
|
void RootView::HandleKeyEvent(const input::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;
|
|
}
|
|
|
|
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
|