github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: context menu runs action under cursor when opened (#46436)

Browse Source
This commit is contained in:
Shelley Vohr
2025-04-04 06:33:50 +02:00
committed by GitHub
parent ecb4c91979
commit 4306ade3a3
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -152,3 +152,4 @@ allow_denormal_flushing_to_outlive_scoped_object.patch
fix_take_snapped_status_into_account_when_showing_a_window.patch
chore_modify_chromium_handling_of_mouse_events.patch
cherry-pick-b8f80176b163.patch
fix_false_activation_logic_for_context_menu.patch

40
patches/chromium/fix_false_activation_logic_for_context_menu.patch Normal file
View File

@@ -0,0 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Eric Sum <esum@google.com>
Date: Thu, 28 Nov 2024 01:34:06 +0000
Subject: Fix false activation logic for context menu.
See these comments for context on the bug:
https://b.corp.google.com/issues/378757755#comment6
https://b.corp.google.com/issues/378757755#comment7
In local testing on a dedede device with a small screen, the issue
had a ~25-50% repro rate in a problematic area of the screen. After
this change, it hasn't reproduced once in over 50 attempts.
Bug: b:378757755
Change-Id: I1c354b62e473d884406824286b092ae8412f891d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6039992
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Eric Sum <esum@google.com>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1389153}
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index fab337cdefe9bb5288c63db71a5fe1ff3ef08a1d..b38e99d21b715d62baefb962f55b75912654231a 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -585,7 +585,13 @@ void MenuController::Run(Widget* parent,
drag_in_progress_ = false;
closing_event_time_ = base::TimeTicks();
menu_start_time_ = base::TimeTicks::Now();
- menu_start_mouse_press_loc_ = gfx::Point();
+ // In some cases, the context menu is asynchronously created after the "mouse
+ // pressed event" is dispatched, so `RootView::current_event()` below is null.
+ // The mouse press location must be taken from the `anchor_bounds` for these
+ // cases.
+ menu_start_mouse_press_loc_ = source_type == ui::mojom::MenuSourceType::kMouse
+ ? anchor_bounds.origin()
+ : gfx::Point();
ui::Event* event = nullptr;
if (parent) {