Allow to autoselect items in combobox using right mouse button

OpenXRay · Jan 11, 2025 · a0c02d0 · a0c02d0
1 parent f1fdbb1
commit a0c02d0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/xrUICore/ComboBox/UIComboBox.cpp b/src/xrUICore/ComboBox/UIComboBox.cpp
@@ -218,6 +218,34 @@ void CUIComboBox::SetItemToken(int tok_id)
     SetItemIDX(idx);
 }
 
+bool CUIComboBox::SetNextItemSelected(bool next, bool loop)
+{
+    const auto lastItem = (int)m_list_box.GetSize() - 1;
+
+    int idx = (int)m_list_box.GetSelectedIDX();
+
+    if (next)
+    {
+        if (idx < lastItem)
+            idx++;
+        else if (loop)
+            idx = 0;
+        else
+            return false;
+    }
+    else
+    {
+        if (idx > 0)
+            --idx;
+        else if (loop)
+            idx = lastItem;
+        else
+            return false;
+    }
+    SetItemIDX(idx);
+    return true;
+}
+
 void CUIComboBox::OnBtnClicked() { ShowList(!m_list_frame.IsShown()); }
 void CUIComboBox::ShowList(bool bShow)
 {
@@ -290,6 +318,10 @@ bool CUIComboBox::OnMouseAction(float x, float y, EUIMessages mouse_action)
             return true;
         }
     }
+    else if (mouse_action == WINDOW_RBUTTON_DOWN)
+    {
+        SetNextItemSelected(true, true);
+    }
 
     return false;
 }

diff --git a/src/xrUICore/ComboBox/UIComboBox.h b/src/xrUICore/ComboBox/UIComboBox.h
@@ -40,6 +40,8 @@ class XRUICORE_API CUIComboBox final : public CUIWindow, public CUIOptionsItem,
     u32 GetSelectedIDX();
     void SetSelectedIDX(u32 idx);
 
+    bool SetNextItemSelected(bool next, bool loop);
+
     virtual void SendMessage(CUIWindow* pWnd, s16 msg, void* pData = 0);
     virtual void OnFocusLost();
     virtual void OnFocusReceive();