summaryrefslogtreecommitdiff
path: root/Servers/WindowServer/WSClientConnection.cpp
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-11-11 12:21:57 +0100
committerAndreas Kling <awesomekling@gmail.com>2019-11-11 13:13:08 +0100
commitcbecad0a776e0b9a7d5e116740fb70f7ebbba813 (patch)
tree3e457272cca8920e03db33c26c821b4cfffb0715 /Servers/WindowServer/WSClientConnection.cpp
parent77de51d25132892f7f1f72423d00711f4469b147 (diff)
downloadserenity-cbecad0a776e0b9a7d5e116740fb70f7ebbba813.zip
WindowManager: Move more of the menu management logic to WSMenuManager
This patch moves a whole lot of the menu logic from WSWindowManager to its proper home in WSMenuManager. We also get rid of the "close_current_menu()" concept which was easily confused in the presence of submenus. All operations should now be aware of the menu stack instead. (The concept of a single, current menu made a lot more sense when there were no nested menus.)
Diffstat (limited to 'Servers/WindowServer/WSClientConnection.cpp')
-rw-r--r--Servers/WindowServer/WSClientConnection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
index dfb090ac58..0bdb24d1d8 100644
--- a/Servers/WindowServer/WSClientConnection.cpp
+++ b/Servers/WindowServer/WSClientConnection.cpp
@@ -388,7 +388,7 @@ void WSClientConnection::handle_request(const WSAPIDestroyMenuRequest& request)
return;
}
auto& menu = *(*it).value;
- WSWindowManager::the().close_menu(menu);
+ menu.close();
m_menus.remove(it);
remove_child(menu);
WSAPI_ServerMessage response;