From ff9ff688be5c017551f412aee00653b5332bddb1 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 6 Dec 2022 13:48:23 +0100 Subject: [PATCH] tform: Fix "without" event generation when mouse leaves window Fixes #1400 --- panda/src/tform/mouseWatcher.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/panda/src/tform/mouseWatcher.cxx b/panda/src/tform/mouseWatcher.cxx index 54caa1cd88..17b5873d8b 100644 --- a/panda/src/tform/mouseWatcher.cxx +++ b/panda/src/tform/mouseWatcher.cxx @@ -724,19 +724,14 @@ clear_current_regions() { while (old_ri != _current_regions.end()) { // Here's a region we don't have any more. MouseWatcherRegion *old_region = (*old_ri); - old_region->exit_region(param); - throw_event_pattern(_leave_pattern, old_region, ButtonHandle::none()); - if (_preferred_region == old_region) { - _preferred_region = nullptr; - } + without_region(old_region, param); ++old_ri; } _current_regions.clear(); if (_preferred_region != nullptr) { - _preferred_region->exit_region(param); - throw_event_pattern(_leave_pattern, _preferred_region, ButtonHandle::none()); + exit_region(_preferred_region, param); _preferred_region = nullptr; } }