
* chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch1600387
* update desktop_media_list.patch1729156
* update notification_provenance.patch1742779
* update printing.patch1646772
* update verbose_generate_bpad_syms.patch1745986
* update patch metadata * remove printing_compositor manifests1742734
* update for URLLoaderFactoryType enum1754716
* remove gin string16 converter1750093
* ClearCompositorFrame() has been removed1746301
* message_loop -> message_loop_current1738552
* include resource_response header * pdf compositor no longer uses service manager1742734
* chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore1708767
* fix: make std::hash value-non-const broken by1711202
* update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback1753006
* chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to1678182
and update for1678182
* convert CookieChangeListener to new Mojo types1753371
* rename ui::ClipboardType -> ui::ClipboardBuffer1758730
* logging::LoggingSettings log_file -> log_file_path1699477
* roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch1759149
* update printing patch * update cookie usage and fn signatures1758437
* chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch1762335
* Convert enum to enum class for FocusManager::FocusChangeReason1767281
* roll DEPS to latest lkgr * update dom_storage_limits.patch1767556
234 lines
6.6 KiB
C++
234 lines
6.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 "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 defined(OS_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() {}
|
|
|
|
void RootView::SetMenu(AtomMenuModel* 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_.reset(new MenuBar(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::kRawKeyDown);
|
|
|
|
// Show the submenu when "Alt+Key" is pressed.
|
|
if (event.GetType() == blink::WebInputEvent::kRawKeyDown &&
|
|
!IsAltKey(event) && IsAltModifier(event)) {
|
|
if (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::kRawKeyDown && IsAltKey(event)) {
|
|
// When a single Alt is pressed:
|
|
menu_bar_alt_pressed_ = true;
|
|
} else if (event.GetType() == blink::WebInputEvent::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(insets_.left(), insets_.top(),
|
|
size().width() - insets_.width(), kMenuBarHeight)
|
|
: gfx::Rect();
|
|
if (menu_bar_)
|
|
menu_bar_->SetBoundsRect(menu_bar_bounds);
|
|
|
|
window_->content_view()->SetBoundsRect(
|
|
gfx::Rect(insets_.left(),
|
|
menu_bar_visible_ ? menu_bar_bounds.bottom() : insets_.top(),
|
|
size().width() - insets_.width(),
|
|
size().height() - menu_bar_bounds.height() - insets_.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(AtomMenuModel* 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);
|
|
}
|
|
|
|
void RootView::SetInsets(const gfx::Insets& insets) {
|
|
if (insets != insets_) {
|
|
insets_ = insets;
|
|
Layout();
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|