Merge pull request #90639 from YeldhamDev/stay_open_please

Fix submenus erroneously closing on some occasions
godotengine · Apr 17, 2024 · fad6897 · fad6897
2 parents 544ecc1 + 978ffb3
commit fad6897
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
@@ -640,11 +640,17 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 
  for (const Rect2 &E : autohide_areas) {
  if (!Rect2(Point2(), get_size()).has_point(m->get_position()) && E.has_point(m->get_position())) {
+ // The mouse left the safe area, prepare to close.
  _close_pressed();
  return;
  }
  }
 
+ if (!minimum_lifetime_timer->is_stopped()) {
+ // The mouse left the safe area, but came back again, so cancel the auto-closing.
+ minimum_lifetime_timer->stop();
+ }
+
  if (!item_clickable_area.has_point(m->get_position())) {
  return;
  }