From 72d68b4025fcfba530023637952af655dd16873b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 21 Jan 2020 21:37:49 +0100 Subject: LibCore: Fix broken "stay_within" mechanism in event dispatch The "stay_within" parameter to CObject::dispatch_event() optionally specifies a node in the CObject parent chain where event dispatch should stop bubbling upwards. Since event dispatch is done recursively, this was not working right, as we would simply return from the innermost dispatch loop, leaving the event un-accepted, which meant that the penultimately inner dispatch loop would pick up the event and keep bubbling it anyway. This made it possible for events to jump across window boundaries within an application, in cases where one window was a CObject ancestor of another window. This is typically the case with dialog windows. Fix #1078. --- Libraries/LibCore/CObject.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Libraries') diff --git a/Libraries/LibCore/CObject.cpp b/Libraries/LibCore/CObject.cpp index efdd70ad1c..8e15383428 100644 --- a/Libraries/LibCore/CObject.cpp +++ b/Libraries/LibCore/CObject.cpp @@ -189,6 +189,11 @@ void CObject::dispatch_event(CEvent& e, CObject* stay_within) do { target->event(e); target = target->parent(); + if (target == stay_within) { + // Prevent the event from bubbling any further. + e.accept(); + break; + } } while (target && target != stay_within && !e.is_accepted()); } -- cgit v1.2.3