From 0c08f948d7014e66d5a79d7584c03164af2edd93 Mon Sep 17 00:00:00 2001 From: DS Date: Wed, 26 Feb 2020 12:18:05 +0100 Subject: [PATCH] GUIInventoryList: fix dropping items when clicking outside of formspec window (#9422) --- src/gui/guiInventoryList.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/guiInventoryList.cpp b/src/gui/guiInventoryList.cpp index ae7ec0539..536471229 100644 --- a/src/gui/guiInventoryList.cpp +++ b/src/gui/guiInventoryList.cpp @@ -176,7 +176,14 @@ bool GUIInventoryList::OnEvent(const SEvent &event) Environment->getRootGUIElement()->getElementFromPoint( core::position2d(event.MouseInput.X, event.MouseInput.Y)); - bool ret = hovered && hovered->OnEvent(event); + // if the player clicks outside of the formspec window, hovered is not + // m_fs_menu, but some other weird element (with ID -1). we do however need + // hovered to be m_fs_menu as item dropping when clicking outside of the + // formspec window is handled in its OnEvent callback + if (!hovered || hovered->getID() == -1) + hovered = m_fs_menu; + + bool ret = hovered->OnEvent(event); IsVisible = was_visible; -- 2.25.1