RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00
Code Issues Activity Actions

LibGUI: Pass context menu events through normal event dispatch

Browse source 
Previously we'd synthesize an event and invoke context_menu_event()
directly. This prevented the event from bubbling even if ignored.
This commit is contained in:
Andreas Kling 2021-08-20 01:17:38 +02:00
parent 20b104dead
commit 8fce5caa49
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibGUI/Widget.cpp
View file

@ -303,6 +303,8 @@ void Widget::event(Core::Event& event)
return handle_leave_event(event); return handle_leave_event(event);
case Event::EnabledChange: case Event::EnabledChange:
return change_event(static_cast<Event&>(event)); return change_event(static_cast<Event&>(event));
case Event::ContextMenu:
return context_menu_event(static_cast<ContextMenuEvent&>(event));
default: default:
return Core::Object::event(event); return Core::Object::event(event);
} }
@ -313,7 +315,7 @@ void Widget::handle_keydown_event(KeyEvent& event)
keydown_event(event); keydown_event(event);
if (event.key() == KeyCode::Key_Menu) { if (event.key() == KeyCode::Key_Menu) {
ContextMenuEvent c_event(window_relative_rect().bottom_right(), screen_relative_rect().bottom_right()); ContextMenuEvent c_event(window_relative_rect().bottom_right(), screen_relative_rect().bottom_right());
context_menu_event(c_event); dispatch_event(c_event);
} }
} }
@ -420,7 +422,7 @@ void Widget::handle_mousedown_event(MouseEvent& event)
mousedown_event(event); mousedown_event(event);
if (event.button() == MouseButton::Right) { if (event.button() == MouseButton::Right) {
ContextMenuEvent c_event(event.position(), screen_relative_rect().location().translated(event.position())); ContextMenuEvent c_event(event.position(), screen_relative_rect().location().translated(event.position()));
context_menu_event(c_event); dispatch_event(c_event);
} }
} }
@ -516,8 +518,9 @@ void Widget::mousewheel_event(MouseEvent& event)
event.ignore(); event.ignore();
} }
void Widget::context_menu_event(ContextMenuEvent&) void Widget::context_menu_event(ContextMenuEvent& event)
{ {
event.ignore();
} }
void Widget::focusin_event(FocusEvent&) void Widget::focusin_event(FocusEvent&)