Ticket #2405: COList_cpp_add_event_header_selection.patch

source/gui/COList.cpp

@@ -19 +19 @@
 #include "i18n/L10n.h"
 
 #include "ps/CLogger.h"
+#include "soundmanager/ISoundManager.h"
 
 COList::COList() : CList(),m_HeadingHeight(30.f)
 {
     AddSetting(GUIST_CGUISpriteInstance,    "sprite_heading");
+    AddSetting(GUIST_bool, "sortable");
+    AddSetting(GUIST_CStr, "selected_column");
+    AddSetting(GUIST_int, "selected_def");
+
+    // Nothing is selected as default.
+    GUI<CStr>::SetSetting(this, "selected_column", "");
+    GUI<int>::SetSetting(this, "selected_def", -1);
 }
 
 void COList::SetupText()
@@ -119 +127 @@
 void COList::HandleMessage(SGUIMessage &Message)
 {
     CList::HandleMessage(Message);
+
+    switch (Message.type)
+    {
+    case GUIM_MOUSE_PRESS_LEFT:
+    {
+        bool sortable;
+        GUI<bool>::GetSetting(this, "sortable", sortable);
+        if (!sortable)
+            break;
+
+        CPos mouse = GetMousePos();
+        if (!m_CachedActualSize.PointInside(mouse))
+            break;
+
+        float xpos = 0;
+        int set = -1;
+        for (unsigned int def = 0; def < m_ObjectsDefs.size(); ++def)
+        {
+            // Check if it's a decimal value, and if so, assume relative positioning.
+            float width = 0;
+            if (m_ObjectsDefs[def].m_Width < 1 && m_ObjectsDefs[def].m_Width > 0)
+                width = m_ObjectsDefs[def].m_Width * m_TotalAvalibleColumnWidth;
+            else
+                width = m_ObjectsDefs[def].m_Width;
+            CPos leftTopCorner = m_CachedActualSize.TopLeft() + CPos(xpos, 4);
+            if (mouse.x >= leftTopCorner.x &&
+                mouse.x < leftTopCorner.x + width &&
+                mouse.y < leftTopCorner.y + m_HeadingHeight)
+            {
+                set = def;
+                break;
+            }
+            xpos += width;
+        }
+
+        if (set != -1)
+        {
+            GUI<CStr>::SetSetting(this, "selected_column", m_ObjectsDefs[set].m_Id.substr(5));
+            GUI<int>::SetSetting(this, "selected_def", set);
+            ScriptEvent("selectioncolumnchange");
+
+            CStrW soundPath;
+            if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_selected", soundPath) == PSRETURN_OK && !soundPath.empty())
+                g_SoundManager->PlayAsUI(soundPath.c_str(), false);
+        }
+        break;
+    }
+    default:
+        break;
+    }
 }
 
 bool COList::HandleAdditionalChildren(const XMBElement& child, CXeromyces* pFile)