fix: context-menu emitted twice (#44997)
* fix: context-menu emitted twice Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * refactor: simplify disabling draggable regions Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> * cleanup Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
This commit is contained in:
parent
cfe549c739
commit
521835d70b
6 changed files with 51 additions and 65 deletions
|
@ -371,6 +371,9 @@ namespace electron::api {
|
|||
|
||||
namespace {
|
||||
|
||||
// Global toggle for disabling draggable regions checks.
|
||||
bool g_disable_draggable_regions = false;
|
||||
|
||||
constexpr std::string_view CursorTypeToString(
|
||||
ui::mojom::CursorType cursor_type) {
|
||||
switch (cursor_type) {
|
||||
|
@ -2049,6 +2052,10 @@ void WebContents::DraggableRegionsChanged(
|
|||
draggable_region_ = DraggableRegionsToSkRegion(regions);
|
||||
}
|
||||
|
||||
SkRegion* WebContents::draggable_region() {
|
||||
return g_disable_draggable_regions ? nullptr : draggable_region_.get();
|
||||
}
|
||||
|
||||
void WebContents::DidStartNavigation(
|
||||
content::NavigationHandle* navigation_handle) {
|
||||
EmitNavigationEvent("did-start-navigation", navigation_handle);
|
||||
|
@ -4592,6 +4599,11 @@ std::list<WebContents*> WebContents::GetWebContentsList() {
|
|||
return list;
|
||||
}
|
||||
|
||||
// static
|
||||
void WebContents::SetDisableDraggableRegions(bool disable) {
|
||||
g_disable_draggable_regions = disable;
|
||||
}
|
||||
|
||||
// static
|
||||
gin::WrapperInfo WebContents::kWrapperInfo = {gin::kEmbedderNativeGin};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue