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 event emitted in draggable regions (#45813)

Browse Source 
* fix: context-menu event emitted in draggable regions

* fix: only trigger on mouse release
This commit is contained in:
Shelley Vohr
2025-02-27 20:44:46 +01:00
committed by GitHub
parent 00089a951b
commit eac1a7ff68
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
shell/browser/ui/electron_desktop_window_tree_host_linux.cc
View File

@@ -12,6 +12,7 @@
#include "base/feature_list.h"
#include "base/i18n/rtl.h"
#include "shell/browser/api/electron_api_web_contents.h"
#include "shell/browser/native_window_features.h"
#include "shell/browser/native_window_views.h"
#include "shell/browser/ui/views/client_frame_view_linux.h"
@@ -241,4 +242,23 @@ void ElectronDesktopWindowTreeHostLinux::UpdateFrameHints() {
SizeConstraintsChanged();
}
}
void ElectronDesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
if (event->IsMouseEvent()) {
auto* mouse_event = static_cast<ui::MouseEvent*>(event);
bool is_mousedown = mouse_event->type() == ui::EventType::kMousePressed;
bool is_system_menu_trigger =
is_mousedown &&
(mouse_event->IsRightMouseButton() ||
(mouse_event->IsLeftMouseButton() && mouse_event->IsControlDown()));
if (is_system_menu_trigger) {
electron::api::WebContents::SetDisableDraggableRegions(true);
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
electron::api::WebContents::SetDisableDraggableRegions(false);
return;
}
}
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
}
} // namespace electron

1
shell/browser/ui/electron_desktop_window_tree_host_linux.h
View File

@@ -60,6 +60,7 @@ class ElectronDesktopWindowTreeHostLinux
// views::DesktopWindowTreeHostLinux:
void UpdateFrameHints() override;
void DispatchEvent(ui::Event* event) override;
private:
void UpdateWindowState(ui::PlatformWindowState new_state);