-
Notifications
You must be signed in to change notification settings - Fork 15k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: allow contextmenu event in draggable regions (#37386)
- Loading branch information
Showing
7 changed files
with
73 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// 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/cocoa/delayed_native_view_host.h" | ||
#include "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h" | ||
|
||
namespace electron { | ||
|
||
DelayedNativeViewHost::DelayedNativeViewHost(gfx::NativeView native_view) | ||
: native_view_(native_view) {} | ||
|
||
DelayedNativeViewHost::~DelayedNativeViewHost() = default; | ||
|
||
void DelayedNativeViewHost::ViewHierarchyChanged( | ||
const views::ViewHierarchyChangedDetails& details) { | ||
NativeViewHost::ViewHierarchyChanged(details); | ||
if (details.is_add && GetWidget()) | ||
Attach(native_view_); | ||
} | ||
|
||
bool DelayedNativeViewHost::OnMousePressed(const ui::MouseEvent& ui_event) { | ||
// NativeViewHost::OnMousePressed normally isn't called, but | ||
// NativeWidgetMacNSWindow specifically carves out an event here for | ||
// right-mouse-button clicks. We want to forward them to the web content, so | ||
// handle them here. | ||
// See: | ||
// https://source.chromium.org/chromium/chromium/src/+/main:components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm;l=415-421;drc=a5af91924bafb85426e091c6035801990a6dc697 | ||
ElectronInspectableWebContentsView* inspectable_web_contents_view = | ||
(ElectronInspectableWebContentsView*)native_view_.GetNativeNSView(); | ||
[inspectable_web_contents_view | ||
redispatchContextMenuEvent:ui_event.native_event()]; | ||
|
||
return true; | ||
} | ||
|
||
} // namespace electron |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters