* chore: bump chromium in DEPS to 5ce64b91b4d6a78c97480059f15ff6469fc0918e * chore: bump chromium in DEPS to e74c73d0000f81b3f40a513176c8d024bba57d28 * chore: bump chromium in DEPS to 501640e650d4657ba63db65fa257e4a899168de7 * chore: bump chromium in DEPS to 00db20e1bc3d77706723a87ada3c1c647a1c37b7 * chore: update patches * refactor: AddNewContents now takes a target_url Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2167732 * chore: SetHostCleanupFinalizationGroupCallback has been removed from V8 * refactor: use WebInputEvent::Namespace types directly Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2160523 * refactor: FollowRedirect takes in cors exempt headers now Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2129787 * refactor: printing::DuplexMode moved to mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2162388 * refactor: use MessagePortDescriptor instead of raw mojo::MessagePipeHandles Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * chore: update patches * chore: bump chromium in DEPS to f1537676d613f3567cfb43adf577b3847fba4bc3 * chore: update patches * refactor: service_manager::BinderMapWithContext merged into mojo::BinderMap Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2174654 * chore: unused argument removed from ReadAvailableTypes in ui::Clipboard Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2173666 * chore: bump chromium in DEPS to 949888433ab935dd6125c107226a4c9d6da9bf48 * chore: update patches * update patches * chore: update sysroots * chore: bump chromium in DEPS to eaac5b5035fe189b6706e1637122e37134206059 * chore: bump chromium in DEPS to 258b54b903d33dab963adf59016691e6537f8b70 * build: update patches * refactor: cursor.mojom and cursor_types.mojom moved to //ui/base/cursor/mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172874 * chore: DesktopWindowTreeHostLinux becomes DesktopWindowTreeHostPlatform Refs: * refactor: LogErrorEventDescription moved from ui to x11 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2164245 * chore: update patches * chore: bump chromium in DEPS to bd06abcfe807d4461683479237cdd920dafa52ca * chore: bump chromium in DEPS to 1afb0891e56f1e79d204db43ca053a46d0974511 * chore: bump chromium in DEPS to 5cb0f794bf7f155bf8c0a241b94e01c9d90c2744 * chore: bump chromium in DEPS to 37327ba3303234e1a3cd3310ca11a68e81b95123 * update patches * remove ClientSideDetectionService from browser_process Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2175320 * refactor: shuttle cursor changed event to WebContentsObserver Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 * chore: bump chromium in DEPS to 1d97904bb6936e106df13705208b73e47367c2b9 * avoid IPC crash introduced earlier in the roll Refs: https://github.com/electron/electron/pull/23379/commits/b67334e781d2c8c01972f65e2d574e621ac79964#diff-607f4e8f7c5686aa09af98c783925babR128 * remove WebContentsView::SizeContents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2188931 * chore: bump chromium in DEPS to 87066d1db0546a9de33952ba964e1e42f76f1dae * update patches * adapt to //content creating NetworkContexts https://chromium-review.googlesource.com/c/chromium/src/+/2195196 * WIP temporarily ignore mojo-ified PrintHostMsg_PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 * add checkout_pgo_profiles to DEPS * chore: bump chromium in DEPS to a095318bec1dedf580d676f408eaeefdbd9956b1 * add blink's execution_context to electron_lib deps Refs: https://github.com/electron/electron/pull/23379/commits/b67334e781d2c8c01972f65e2d574e621ac79964#, https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * update patches * update patches * refactor: use newly mojo-ified PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: update patches * chore: remove NOTIFICATION_EXTENSIONS_READY_DEPRECATED Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2199874 * avoid a call to Profile::FromBrowserContext in printing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195757 * chore: bump chromium in DEPS to 8f5c6a46861a991e12ffd80554b6bd41a11b0b65 * chore: bump chromium in DEPS to ab66134739ff3b6bdb8de53bbc58a97d1b7b5d8a * chore: bump chromium in DEPS to dd08df9f6c8d6198f0a7b931ca9e845e27dae033 * chore: update patches * [printing] Mojofy PrintHostMsg_PrintPreviewCancelled https://chromium-review.googlesource.com/c/chromium/src/+/2198331 * [printing] Mojofy PrintHostMsg_PrintPreviewInvalidPrinterSettings https://chromium-review.googlesource.com/c/chromium/src/+/2200556 * [printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview https://chromium-review.googlesource.com/c/chromium/src/+/2201496 * fix: inherit base network context params * fix: use message handle api specific to embedders * update patches * chore: update v8 headers * fixup! avoid a call to Profile::FromBrowserContext in printing * chore: bump chromium in DEPS to f198bc3276828d992b6202d75a9da6a8363164ea * chore: update patches * Remove cors_exempt_headers.h https://chromium-review.googlesource.com/c/chromium/src/+/2203759 * Supply speech recognition sandbox from service_sandbox_type.h https://chromium-review.googlesource.com/c/chromium/src/+/2206918 * [content] Remove unused methods from WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2199113 * [XProto] Replace XAtom with x11::Atom https://chromium-review.googlesource.com/c/chromium/src/+/2202789 * chore: bump chromium in DEPS to 5df37fabaaed09f3ea511f4ef49203d8ebee7b68 * [UI] Support secondary labels in dropdown menus https://chromium-review.googlesource.com/c/chromium/src/+/2208976 * chore: update patches * refactor: GetSublabelAt => GetSecondaryLabelAt * Revert "[printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview" This reverts commit 44ed0892a0c81716229638f17253bbb2cf8f037d. https://chromium-review.googlesource.com/c/chromium/src/+/2208778 * Unnest CanonicalCookie::CookieInclusionStatus https://chromium-review.googlesource.com/c/chromium/src/+/2203171 * update print-to-pdf.html with latest html data https://bugs.chromium.org/p/chromium/issues/detail?id=1085667 * chore: bump chromium in DEPS to 5dfa8d5f706580fe983e138952553cd6af11ee8b * fix crash in x server when setting window icon * chore: update patches * Use a normal return value for WebContentsView::GetContainerBounds. https://chromium-review.googlesource.com/c/chromium/src/+/2212481 * fix build on windows * chore: bump chromium in DEPS to 9d15054f4cba060901e43deecf74002f11f47be3 * chore: update patches * [printing] Mojofy PrintHostMsg_CheckForCancel https://chromium-review.googlesource.com/c/chromium/src/+/2212181 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
		
			
				
	
	
		
			227 lines
		
	
	
	
		
			6.3 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			227 lines
		
	
	
	
		
			6.3 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 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() = 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>(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 &&
 | 
						|
      !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::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
 |