Ticket #2405: lobby_game_list_sorting_without_arrows.patch

binaries/data/mods/public/gui/lobby/lobby.js

@@ -1 +1 @@
 var g_ChatMessages = [];
 var g_Name = "unknown";
 var g_GameList = {};
+var g_GameListSortBy = "default";
+var g_GameListOrder = 1; // 1 for ascending sort, and -1 for descending
 var g_specialKey = Math.random();
 // This object looks like {"name":[numMessagesSinceReset, lastReset, timeBlocked]} when in use.
 var g_spamMonitor = {};
@@ -74 +76 @@
 // Update functions
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
+function updateOrderSelection()
+{
+    var newGameListSortBy = Engine.GetGUIObjectByName("gamesBox").selected_column;
+    if (newGameListSortBy == g_GameListSortBy)
+        g_GameListOrder = -g_GameListOrder;
+    else
+    {
+        g_GameListSortBy = newGameListSortBy;
+        g_GameListOrder = 1;
+    }
+
+    // update the list of games
+    updateGameList();
+
+    // Update info box about the game currently selected
+    updateGameSelection();
+}
+
 function resetFilters()
 {
     // Reset states of gui objects
@@ -365 +385 @@
     // Sort the list of games to that games 'waiting' are displayed at the top, followed by 'init', followed by 'running'.
     var gameStatuses = ['waiting', 'init', 'running'];
     g_GameList.sort(function (a,b) {
-        if (gameStatuses.indexOf(a.state) < gameStatuses.indexOf(b.state))
-            return -1;
-        else if (gameStatuses.indexOf(a.state) > gameStatuses.indexOf(b.state))
-            return 1;
+        if (g_GameListSortBy == 'name')
+        {
+            // Alphabetical comparison of names.
+            if (a.name < b.name)
+                return -g_GameListOrder;
+            else if (a.name > b.name)
+                return g_GameListOrder;
+            return 0;
+        }
+        else if (g_GameListSortBy == 'mapName')
+        {
+            // Alphabetical comparison of map names.
+            if (translate(a.niceMapName) < translate(b.niceMapName))
+                return -g_GameListOrder;
+            else if (translate(a.niceMapName) > translate(b.niceMapName))
+                return g_GameListOrder;
+            return 0;
+        }
+        else if (g_GameListSortBy == 'mapSize')
+        {
+            // Alphabetical comparison of map size.
+            if (translatedMapSize(a.mapSize) < translatedMapSize(b.mapSize))
+                return -g_GameListOrder;
+            else if (translatedMapSize(a.mapSize) > translatedMapSize(b.mapSize))
+                return g_GameListOrder;
+            return 0;
+        }
+        else if (g_GameListSortBy == 'mapType')
+        {
+            // Numerical comparison of map types.
+            if (a.mapType < b.mapType)
+                return -g_GameListOrder;
+            else if (a.mapType > b.mapType)
+                return g_GameListOrder;
+            return 0;
+        }
+        else if (g_GameListSortBy == 'nPlayers')
+        {
+            // Numerical comparison of player count ratio.
+            if (a.nbp * b.tnbp < b.nbp * a.tnbp) // ratio a = a.nbp / a.tnbp, ratio b = b.nbp / b.tnbp
+                return -g_GameListOrder;
+            else if (a.nbp * b.tnbp > b.nbp * a.tnbp)
+                return g_GameListOrder;
+            return 0;
+        }
+        else
+        {
+            if (gameStatuses.indexOf(a.state) < gameStatuses.indexOf(b.state))
+                return -1;
+            else if (gameStatuses.indexOf(a.state) > gameStatuses.indexOf(b.state))
+                return 1;
 
-        // Alphabetical comparison of names as tiebreaker.
-        if (a.name < b.name)
-            return -1;
-        else if (a.name > b.name)
-            return 1;
-        return 0;
+            // Alphabetical comparison of names as tiebreaker.
+            if (a.name < b.name)
+                return -1;
+            else if (a.name > b.name)
+                return 1;
+            return 0;
+        }
     });
 
     var list_name = [];

binaries/data/mods/public/gui/lobby/lobby.xml

@@ -169 +169 @@
 
         <!-- Middle panel: Filters, game list, chat box. -->
         <object name="middlePanel" size="20%+5 5% 100%-255 97.2%">
-            <object name="gamesBox" style="ModernList" type="olist" size="0 25 100% 48%" font="sans-stroke-13">
+            <object name="gamesBox" style="ModernList" type="olist" sortable="true" size="0 25 100% 48%" font="sans-stroke-13">
                 <action on="SelectionChange">updateGameSelection();</action>
+                <action on="SelectionColumnChange">updateOrderSelection();</action>
                 <def id="name" color="0 60 0" width="27%">
                     <translatableAttribute id="heading">Name</translatableAttribute>
                 </def>