WindowServer: Add MenuManager helper to find closest open ancestor

luteresa · Aug 16, 2022 · 4489f9d · 4489f9d
1 parent db85254
commit 4489f9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Userland/Services/WindowServer/MenuManager.cpp b/Userland/Services/WindowServer/MenuManager.cpp
@@ -229,6 +229,14 @@ void MenuManager::close_everyone()
  clear_current_menu();
 }
 
+Menu* MenuManager::closest_open_ancestor_of(Menu const& other) const
+{
+ for (auto& menu : m_open_menu_stack.in_reverse())
+ if (menu->is_menu_ancestor_of(other))
+ return menu.ptr();
+ return nullptr;
+}
+
 void MenuManager::close_everyone_not_in_lineage(Menu& menu)
 {
  Vector<Menu&> menus_to_close;

diff --git a/Userland/Services/WindowServer/MenuManager.h b/Userland/Services/WindowServer/MenuManager.h
@@ -26,6 +26,7 @@ class MenuManager final : public Core::Object {
  bool has_open_menu() const { return !m_open_menu_stack.is_empty(); }
 
  Menu* current_menu() { return m_current_menu.ptr(); }
+ Menu* closest_open_ancestor_of(Menu const&) const;
  void set_current_menu(Menu*);
  void clear_current_menu();
  void open_menu(Menu&, bool as_current_menu = true);