Ticket #3905: 3905_COList_refresh_v2.patch

source/gui/COList.cpp

@@ -24 +24 @@
 #include "soundmanager/ISoundManager.h"
 
 COList::COList()
-    : CList(), m_HeadingHeight(30.f), m_SelectedDef(-1), m_SelectedColumnOrder(0)
+    : CList(), m_HeadingHeight(30.f), m_SelectedColumn(-1), m_SelectedColumnOrder(0)
 {
     AddSetting(GUIST_CGUISpriteInstance,    "sprite_heading");
     AddSetting(GUIST_bool,                  "sortable"); // The actual sorting is done in JS for more versatility
@@ -90 +90 @@
         *text = GetGUI()->GenerateText(gui_string, font, width, buffer_zone, this);
         AddText(text);
 
-        if (m_SelectedDef == (size_t)-1 && defaultColumn == m_ObjectsDefs[c].m_Id)
-            m_SelectedDef = c;
+        if (m_SelectedColumn == (size_t)-1 && defaultColumn == m_ObjectsDefs[c].m_Id)
+            m_SelectedColumn = c;
     }
 
-    if (m_SelectedDef != (size_t)-1)
-        GUI<CStr>::SetSetting(this, "selected_column", m_ObjectsDefs[m_SelectedDef].m_Id.substr(5));
+    if (m_SelectedColumn != (size_t)-1)
+        GUI<CStr>::SetSetting(this, "selected_column", m_ObjectsDefs[m_SelectedColumn].m_Id.substr(5));
 
     if (m_SelectedColumnOrder == 0)
     {
@@ -147 +147 @@
 
     switch (Message.type)
     {
+    case GUIM_SETTINGS_UPDATED:
+        {
+            if (Message.value == "selected_column_order")
+                GUI<int>::GetSetting(this, "selected_column_order", m_SelectedColumnOrder);
+            if (Message.value == "selected_column")
+            {
+                CStr selectedColumn;
+                GUI<CStr>::GetSetting(this, "selected_column", selectedColumn);
+                for (size_t c = 0; c < m_ObjectsDefs.size(); ++c)
+                {
+                    if (m_ObjectsDefs[c].m_Id.substr(5) == selectedColumn)
+                        m_SelectedColumn = c;
+                }
+            }
+            return;
+        }
     // If somebody clicks on the column heading
     case GUIM_MOUSE_PRESS_LEFT:
     {
@@ -171 +187 @@
                 mouse.x < leftTopCorner.x + width &&
                 mouse.y < leftTopCorner.y + m_HeadingHeight)
             {
-                if (def != m_SelectedDef)
+                if (def != m_SelectedColumn)
                 {
                     m_SelectedColumnOrder = 1;
-                    m_SelectedDef = def;
+                    m_SelectedColumn = def;
                 }
                 else
                     m_SelectedColumnOrder = -m_SelectedColumnOrder;
@@ -391 +407 @@
 
         CGUISpriteInstance* sprite;
         // If the list sorted by current column
-        if (m_SelectedDef == def)
+        if (m_SelectedColumn == def)
             sprite = sprite_order;
         else
             sprite = sprite_not_sorted;

source/gui/COList.h

@@ -68 +68 @@
     /**
      * Index of the selected column.
      */
-    size_t m_SelectedDef;
+    size_t m_SelectedColumn;
 
     /**
      * +1 for ascending, -1 for descending sort order.