mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: support system-context-menu on Linux (#45848)

Browse source 
feat: support system-context-menu on Linux
This commit is contained in:
Shelley Vohr 2025-04-01 11:00:39 +02:00 • committed by GitHub
parent 77833eddfb
commit 5da75c4a97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
shell/browser/ui/electron_desktop_window_tree_host_linux.cc
View file

@ -17,6 +17,9 @@
#include "shell/browser/native_window_views.h"
#include "shell/browser/ui/views/client_frame_view_linux.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/hit_test.h"
#include "ui/display/screen.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/skia_conversions.h"
#include "ui/linux/linux_ui.h"
@ -262,13 +265,45 @@ void ElectronDesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
is_mousedown &&
(mouse_event->IsRightMouseButton() ||
(mouse_event->IsLeftMouseButton() && mouse_event->IsControlDown()));
if (is_system_menu_trigger) {
electron::api::WebContents::SetDisableDraggableRegions(true);
if (!is_system_menu_trigger) {
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
electron::api::WebContents::SetDisableDraggableRegions(false);
return;
}
// Determine the non-client area and dispatch 'system-context-menu'.
if (GetContentWindow() && GetContentWindow()->delegate()) {
ui::LocatedEvent* located_event = event->AsLocatedEvent();
gfx::PointF location = located_event->location_f();
gfx::PointF location_in_dip =
GetRootTransform().InverseMapPoint(location).value_or(location);
int hit_test_code = GetContentWindow()->delegate()->GetNonClientComponent(
gfx::ToRoundedPoint(location_in_dip));
if (hit_test_code != HTCLIENT && hit_test_code != HTNOWHERE) {
bool prevent_default = false;
native_window_view_->NotifyWindowSystemContextMenu(
located_event->x(), located_event->y(), &prevent_default);
// If |prevent_default| is true, then the user might want to show a
// custom menu - proceed propagation and emit context-menu in the
// renderer. Otherwise, show the native system window controls menu.
if (prevent_default) {
electron::api::WebContents::SetDisableDraggableRegions(true);
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
electron::api::WebContents::SetDisableDraggableRegions(false);
} else {
if (ui::OzonePlatform::GetInstance()
->GetPlatformRuntimeProperties()
.supports_server_window_menus) {
views::DesktopWindowTreeHostLinux::ShowWindowControlsMenu(
display::Screen::GetScreen()->GetCursorScreenPoint());
}
}
return;
}
}
}
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
}