From 9ebb85f5207d43bbf1b1410fffe84e4e92665895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sun, 20 Feb 2022 19:56:51 +0100 Subject: [PATCH] Fix listbox item double click behavior --- src/game/client/components/menus_demo.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index d9242242d..543ed9d57 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -634,8 +634,10 @@ CMenus::CListboxItem CMenus::UiDoListboxNextItem(const void *pId, bool Selected, HitRect.h = minimum(HitRect.h, (gs_ListBoxOriginalView.y + gs_ListBoxOriginalView.h) - HitRect.y); + bool DoubleClickable = false; if(Item.m_Visible && UI()->DoButtonLogic(pId, "", gs_ListBoxSelectedIndex == gs_ListBoxItemIndex, &HitRect)) { + DoubleClickable |= gs_ListBoxNewSelected == ThisItemIndex; gs_ListBoxClicked = true; gs_ListBoxNewSelected = ThisItemIndex; } @@ -647,7 +649,7 @@ CMenus::CListboxItem CMenus::UiDoListboxNextItem(const void *pId, bool Selected, { gs_ListBoxDoneEvents = 1; - if(m_EnterPressed || (UI()->ActiveItem() == pId && Input()->MouseDoubleClick())) + if(m_EnterPressed || (DoubleClickable && Input()->MouseDoubleClick())) { gs_ListBoxItemActivated = true; UI()->SetActiveItem(0);