Index: ps/trunk/binaries/data/mods/mod/gui/gui.rng
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/gui.rng	(revision 27397)
+++ ps/trunk/binaries/data/mods/mod/gui/gui.rng	(revision 27398)
@@ -1,912 +1,923 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <choice>
       <ref name="object"/>
       <ref name="objects"/>
       <ref name="setup"/>
       <ref name="sprites"/>
       <ref name="styles"/>
     </choice>
   </start>
   <!--
     xsd:boolean could be used instead of this definition,
     though it considers "1" & "0" as valid values.
   -->
   <define name="bool">
     <a:documentation/>
     <!-- Types # -->
     <a:documentation/>
     <choice>
       <value>true</value>
       <value>false</value>
     </choice>
   </define>
   <define name="align">
     <choice>
       <value>left</value>
       <value>center</value>
       <value>right</value>
     </choice>
   </define>
   <define name="valign">
     <choice>
       <value>top</value>
       <value>center</value>
       <value>bottom</value>
     </choice>
   </define>
   <define name="wrapmode">
     <choice>
       <value>repeat</value>
       <value>mirrored_repeat</value>
       <value>clamp_to_edge</value>
     </choice>
   </define>
   <define name="coord">
     <data type="string">
       <param name="pattern">-?\d*\.?\d+%?([\+\-]\d*\.?\d+%?)*</param>
     </data>
   </define>
   <define name="clientarea">
     <list>
       <ref name="coord"/>
       <ref name="coord"/>
       <ref name="coord"/>
       <ref name="coord"/>
     </list>
   </define>
   <!-- color can be a name or "R G B A" format string -->
   <define name="rgba">
     <list>
       <data type="integer">
         <param name="minInclusive">0</param>
         <param name="maxInclusive">255</param>
       </data>
       <data type="integer">
         <param name="minInclusive">0</param>
         <param name="maxInclusive">255</param>
       </data>
       <data type="integer">
         <param name="minInclusive">0</param>
         <param name="maxInclusive">255</param>
       </data>
       <optional>
         <data type="integer">
           <param name="minInclusive">0</param>
           <param name="maxInclusive">255</param>
         </data>
       </optional>
     </list>
   </define>
   <define name="ccolor">
     <choice>
       <ref name="rgba"/>
       <data type="string">
         <param name="pattern">[A-Za-z]+</param>
       </data>
     </choice>
   </define>
   <define name="size">
     <list>
       <data type="decimal"/>
       <data type="decimal"/>
     </list>
   </define>
   <define name="pos">
     <list>
       <data type="decimal"/>
       <data type="decimal"/>
     </list>
   </define>
   <define name="rect">
     <list>
       <data type="decimal"/>
       <data type="decimal"/>
       <data type="decimal"/>
       <data type="decimal"/>
     </list>
   </define>
+  <define name="sort_order">
+    <choice>
+      <value>asc</value>
+      <value>desc</value>
+    </choice>
+  </define>
   <define name="unique_settings">
     <a:documentation/>
     <!-- Defines # -->
     <a:documentation/>
     <optional>
       <attribute name="name"/>
     </optional>
     <optional>
       <attribute name="type" a:defaultValue="empty"/>
     </optional>
     <optional>
       <attribute name="style"/>
     </optional>
   </define>
   <!--
     This could probably be made more specific/strict
     with more information regarding the use/meaning
     of these attributes.
   -->
   <define name="base_settings">
     <interleave>
       <optional>
         <attribute name="absolute">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="enable">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="ghost">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="hidden">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="size">
           <ref name="clientarea"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="z">
           <data type="decimal"/>
         </attribute>
       </optional>
     </interleave>
   </define>
   <!-- Defaults are not put in here, because it ruins the concept of styles. -->
   <define name="ex_settings">
     <interleave>
       <optional>
         <attribute name="anchor">
           <ref name="valign"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="auto_scroll">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="axis_color">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="axis_width">
           <data type="decimal">
             <param name="minInclusive">0</param>
           </data>
         </attribute>
       </optional>
       <optional>
         <attribute name="buffer_zone">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="buffer_width">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="button_width">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="checked">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="clip">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="dropdown_size">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="dropdown_buffer">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="minimum_visible_items">
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="enabled">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_texture_count">
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_render_size">
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_animation_speed">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_interleave">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_lifetime_seconds">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_start_fade_seconds">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="flare_stop_fade_seconds">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="font"/>
       </optional>
       <optional>
         <attribute name="format_x"/>
       </optional>
       <optional>
         <attribute name="format_y"/>
       </optional>
       <optional>
         <attribute name="fov_wedge_color">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="hotkey"/>
       </optional>
       <optional>
         <attribute name="independent">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="input_initvalue_destroyed_at_focus">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="mask">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="mouse_event_mask">
           <text/>
         </attribute>
       </optional>
       <optional>
         <attribute name="mask_char">
           <data type="string">
             <param name="minLength">1</param>
             <param name="maxLength">1</param>
           </data>
         </attribute>
       </optional>
       <optional>
         <attribute name="max_length">
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="maxwidth">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="multiline">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="offset">
           <ref name="pos"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="readonly">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="scrollbar">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="scrollbar_style"/>
       </optional>
       <optional>
         <attribute name="scroll_bottom">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="scroll_top">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="selected_column"/>
       </optional>
       <optional>
         <attribute name="selected_column_order"/>
       </optional>
       <optional>
         <attribute name="sortable">
           <ref name="bool"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="sound_closed"/>
       </optional>
       <optional>
         <attribute name="sound_disabled"/>
       </optional>
       <optional>
         <attribute name="sound_enter"/>
       </optional>
       <optional>
         <attribute name="sound_leave"/>
       </optional>
       <optional>
         <attribute name="sound_opened"/>
       </optional>
       <optional>
         <attribute name="sound_pressed"/>
       </optional>
       <optional>
         <attribute name="sound_selected"/>
       </optional>
       <optional>
         <attribute name="sprite"/>
       </optional>
       <optional>
         <attribute name="sprite2"/>
       </optional>
       <optional>
         <attribute name="sprite_asc"/>
       </optional>
       <optional>
         <attribute name="sprite_background"/>
       </optional>
       <optional>
         <attribute name="sprite_bar"/>
       </optional>
       <optional>
         <attribute name="sprite_bar_disabled"/>
       </optional>
       <optional>
         <attribute name="sprite_desc"/>
       </optional>
       <optional>
         <attribute name="sprite_disabled"/>
       </optional>
       <optional>
         <attribute name="sprite_heading"/>
       </optional>
       <optional>
         <attribute name="sprite_list"/>
       </optional>
       <optional>
         <attribute name="sprite_list_overlay"/>
       </optional>
       <optional>
         <attribute name="sprite2_disabled"/>
       </optional>
       <optional>
         <attribute name="sprite_not_sorted"/>
       </optional>
       <optional>
         <attribute name="sprite_over"/>
       </optional>
       <optional>
         <attribute name="sprite_overlay"/>
       </optional>
       <optional>
         <attribute name="sprite_overlay_disabled"/>
       </optional>
       <optional>
         <attribute name="sprite2_over"/>
       </optional>
       <optional>
         <attribute name="sprite_pressed"/>
       </optional>
       <optional>
         <attribute name="sprite2_pressed"/>
       </optional>
       <optional>
         <attribute name="sprite_selectarea"/>
       </optional>
       <optional>
         <attribute name="sprite_selectarea_overlay"/>
       </optional>
       <optional>
         <attribute name="square_side">
           <data type="decimal"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="textcolor">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="textcolor_disabled">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="textcolor_over">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="textcolor_pressed">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="textcolor_selected">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="placeholder_text"/>
       </optional>
       <optional>
         <attribute name="placeholder_color">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="text_align">
           <ref name="align"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="text_valign">
           <ref name="valign"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="tooltip"/>
       </optional>
       <optional>
         <attribute name="tooltip_style"/>
       </optional>
     </interleave>
   </define>
   <define name="objects">
     <a:documentation/>
     <!-- Objects # -->
     <a:documentation/>
     <element name="objects">
       <zeroOrMore>
         <choice>
           <ref name="script"/>
           <ref name="object"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="script">
     <element name="script">
       <interleave>
         <text/>
         <optional>
           <attribute name="file"/>
         </optional>
         <optional>
           <attribute name="directory"/>
         </optional>
       </interleave>
     </element>
   </define>
   <define name="object">
     <element name="object">
       <choice>
         <zeroOrMore>
           <choice>
             <ref name="object"/>
             <ref name="action"/>
             <ref name="attribute"/>
             <ref name="column"/>
             <ref name="include"/>
             <ref name="item"/>
             <ref name="repeat"/>
             <ref name="script"/>
             <ref name="translatableAttribute"/>
           </choice>
         </zeroOrMore>
         <text/>
       </choice>
       <ref name="unique_settings"/>
       <ref name="base_settings"/>
       <ref name="ex_settings"/>
     </element>
   </define>
   <define name="action">
     <element name="action">
       <text/>
       <attribute name="on"/>
       <optional>
         <attribute name="file"/>
       </optional>
     </element>
   </define>
   <define name="attribute">
     <element name="attribute">
       <zeroOrMore>
         <choice>
           <ref name="keep"/>
           <ref name="translate"/>
         </choice>
       </zeroOrMore>
       <attribute name="id"/>
     </element>
   </define>
   <define name="column">
     <element name="column">
       <optional>
         <ref name="translatableAttribute"/>
       </optional>
       <interleave>
         <attribute name="id"/>
         <optional>
           <attribute name="color">
             <ref name="ccolor"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="heading"/>
         </optional>
         <optional>
           <attribute name="width"/>
         </optional>
         <optional>
           <attribute name="hidden">
             <ref name="bool"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="sort_order">
+            <ref name="sort_order"/>
+          </attribute>
+        </optional>
       </interleave>
     </element>
   </define>
   <define name="include">
     <element name="include">
       <choice>
         <attribute name="file"/>
         <attribute name="directory"/>
       </choice>
     </element>
   </define>
   <define name="item">
     <element name="item">
       <text/>
       <optional>
         <attribute name="enabled">
           <ref name="bool"/>
         </attribute>
       </optional>
     </element>
   </define>
   <define name="keep">
     <element name="keep">
       <text/>
     </element>
   </define>
   <define name="repeat">
     <element name="repeat">
       <oneOrMore>
         <ref name="object"/>
       </oneOrMore>
       <attribute name="count">
         <data type="nonNegativeInteger"/>
       </attribute>
       <optional>
         <attribute name="var"/>
       </optional>
     </element>
   </define>
   <define name="translate">
     <element name="translate">
       <text/>
     </element>
   </define>
   <define name="translatableAttribute">
     <element name="translatableAttribute">
       <text/>
       <interleave>
         <attribute name="id"/>
         <optional>
           <attribute name="comment"/>
         </optional>
         <optional>
           <attribute name="context"/>
         </optional>
       </interleave>
     </element>
   </define>
   <define name="styles">
     <a:documentation/>
     <!-- Styles # -->
     <a:documentation/>
     <element name="styles">
       <zeroOrMore>
         <ref name="style"/>
       </zeroOrMore>
     </element>
   </define>
   <define name="style">
     <element name="style">
       <attribute name="name"/>
       <ref name="base_settings"/>
       <ref name="ex_settings"/>
     </element>
   </define>
   <define name="setup">
     <a:documentation/>
     <!-- Setup # -->
     <a:documentation/>
     <element name="setup">
       <zeroOrMore>
         <choice>
           <ref name="icon"/>
           <ref name="scrollbar"/>
           <ref name="tooltip"/>
           <ref name="color"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
   <define name="scrollbar">
     <element name="scrollbar">
       <interleave>
         <attribute name="name"/>
         <attribute name="width">
           <data type="decimal"/>
         </attribute>
         <optional>
           <attribute name="alwaysshown">
             <ref name="bool"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="maximum_bar_size">
             <data type="decimal"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="minimum_bar_size">
             <data type="decimal"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="scroll_wheel">
             <ref name="bool"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="show_edge_buttons">
             <ref name="bool"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="sprite_button_top"/>
         </optional>
         <optional>
           <attribute name="sprite_button_top_pressed"/>
         </optional>
         <optional>
           <attribute name="sprite_button_top_disabled"/>
         </optional>
         <optional>
           <attribute name="sprite_button_top_over"/>
         </optional>
         <optional>
           <attribute name="sprite_button_bottom"/>
         </optional>
         <optional>
           <attribute name="sprite_button_bottom_pressed"/>
         </optional>
         <optional>
           <attribute name="sprite_button_bottom_disabled"/>
         </optional>
         <optional>
           <attribute name="sprite_button_bottom_over"/>
         </optional>
         <optional>
           <attribute name="sprite_bar_vertical"/>
         </optional>
         <optional>
           <attribute name="sprite_bar_vertical_over"/>
         </optional>
         <optional>
           <attribute name="sprite_bar_vertical_pressed"/>
         </optional>
         <optional>
           <attribute name="sprite_back_vertical"/>
         </optional>
       </interleave>
     </element>
   </define>
   <define name="icon">
     <element name="icon">
       <interleave>
         <attribute name="name"/>
         <attribute name="size">
           <ref name="size"/>
         </attribute>
         <attribute name="sprite"/>
       </interleave>
     </element>
   </define>
   <define name="tooltip">
     <element name="tooltip">
       <interleave>
         <attribute name="name"/>
         <optional>
           <attribute name="sprite"/>
         </optional>
         <optional>
           <attribute name="anchor">
             <ref name="valign"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="buffer_zone">
             <data type="decimal"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="font"/>
         </optional>
         <optional>
           <attribute name="maxwidth">
             <data type="decimal"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="offset">
             <ref name="pos"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="textcolor">
             <ref name="ccolor"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="delay">
             <data type="integer"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="use_object"/>
         </optional>
         <optional>
           <attribute name="hide_object">
             <ref name="bool"/>
           </attribute>
         </optional>
       </interleave>
     </element>
   </define>
   <define name="color">
     <element name="color">
       <ref name="rgba"/>
       <attribute name="name"/>
     </element>
   </define>
   <define name="sprites">
     <a:documentation/>
     <!-- Sprites # -->
     <a:documentation/>
     <element name="sprites">
       <zeroOrMore>
         <ref name="sprite"/>
       </zeroOrMore>
     </element>
   </define>
   <define name="sprite">
     <element name="sprite">
       <group>
         <optional>
           <ref name="effect"/>
         </optional>
         <oneOrMore>
           <ref name="image"/>
         </oneOrMore>
       </group>
       <attribute name="name"/>
     </element>
   </define>
   <define name="image">
     <element name="image">
       <optional>
         <ref name="effect"/>
       </optional>
       <interleave>
         <optional>
           <attribute name="texture"/>
         </optional>
         <optional>
           <attribute name="size">
             <ref name="clientarea"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="texture_size">
             <ref name="clientarea"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="real_texture_placement">
             <ref name="rect"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="backcolor">
             <ref name="ccolor"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="fixed_h_aspect_ratio">
             <data type="decimal"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="round_coordinates">
             <ref name="bool"/>
           </attribute>
         </optional>
         <optional>
           <attribute name="wrap_mode">
             <ref name="wrapmode"/>
           </attribute>
         </optional>
       </interleave>
     </element>
   </define>
   <define name="effect">
     <element name="effect">
       <optional>
         <attribute name="add_color">
           <ref name="ccolor"/>
         </attribute>
       </optional>
       <optional>
         <attribute name="grayscale">
           <empty/>
         </attribute>
       </optional>
     </element>
   </define>
 </grammar>
Index: ps/trunk/source/gui/ObjectTypes/COList.cpp
===================================================================
--- ps/trunk/source/gui/ObjectTypes/COList.cpp	(revision 27397)
+++ ps/trunk/source/gui/ObjectTypes/COList.cpp	(revision 27398)
@@ -1,448 +1,452 @@
 /* Copyright (C) 2023 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "COList.h"
 
 #include "gui/CGUI.h"
 #include "gui/IGUIScrollBar.h"
 #include "gui/SettingTypes/CGUIColor.h"
 #include "gui/SettingTypes/CGUIList.h"
 #include "i18n/L10n.h"
 #include "ps/CLogger.h"
 
 const float SORT_SPRITE_DIM = 16.0f;
 const CVector2D COLUMN_SHIFT = CVector2D(0, 4);
 
 const CStr COList::EventNameSelectionColumnChange = "SelectionColumnChange";
 
 COList::COList(CGUI& pGUI)
 	: CList(pGUI),
 	  m_SpriteHeading(this, "sprite_heading"),
 	  m_Sortable(this, "sortable"), // The actual sorting is done in JS for more versatility
 	  m_SelectedColumn(this, "selected_column"),
 	  m_SelectedColumnOrder(this, "selected_column_order"),
 	  m_SpriteAsc(this, "sprite_asc"), // Show the order of sorting
 	  m_SpriteDesc(this, "sprite_desc"),
 	  m_SpriteNotSorted(this, "sprite_not_sorted")
 {
 }
 
 void COList::SetupText()
 {
 	m_ItemsYPositions.resize(m_List->m_Items.size() + 1);
 
 	// Delete all generated texts. Some could probably be saved,
 	//  but this is easier, and this function will never be called
 	//  continuously, or even often, so it'll probably be okay.
 	m_GeneratedTexts.clear();
 
 	m_TotalAvailableColumnWidth = GetListRect().GetWidth();
 	// remove scrollbar if applicable
 	if (m_ScrollBar && GetScrollBar(0).GetStyle())
 		m_TotalAvailableColumnWidth -= GetScrollBar(0).GetStyle()->m_Width;
 
 	m_HeadingHeight = SORT_SPRITE_DIM; // At least the size of the sorting sprite
 
 	for (const COListColumn& column : m_Columns)
 	{
 		float width = column.m_Width;
 		if (column.m_Width > 0 && column.m_Width < 1)
 			width *= m_TotalAvailableColumnWidth;
 
 		CGUIString gui_string;
 		gui_string.SetValue(column.m_Heading);
 
 		const CGUIText& text = AddText(gui_string, m_Font, width, m_BufferZone);
 		m_HeadingHeight = std::max(m_HeadingHeight, text.GetSize().Height + COLUMN_SHIFT.Y);
 	}
 
 	// Generate texts
 	float buffered_y = 0.f;
 
 	for (size_t i = 0; i < m_List->m_Items.size(); ++i)
 	{
 		m_ItemsYPositions[i] = buffered_y;
 		float shift = 0.0f;
 		for (const COListColumn& column : m_Columns)
 		{
 			float width = column.m_Width;
 			if (column.m_Width > 0 && column.m_Width < 1)
 				width *= m_TotalAvailableColumnWidth;
 
 			CGUIText* text;
 			if (!column.m_List->m_Items[i].GetOriginalString().empty())
 				text = &AddText(column.m_List->m_Items[i], m_Font, width, m_BufferZone);
 			else
 			{
 				// Minimum height of a space character of the current font size
 				CGUIString align_string;
 				align_string.SetValue(L" ");
 				text = &AddText(align_string, m_Font, width, m_BufferZone);
 			}
 			shift = std::max(shift, text->GetSize().Height);
 		}
 		buffered_y += shift;
 	}
 
 	m_ItemsYPositions[m_List->m_Items.size()] = buffered_y;
 
 	if (m_ScrollBar)
 	{
 		CRect rect = GetListRect();
 		GetScrollBar(0).SetScrollRange(m_ItemsYPositions.back());
 		GetScrollBar(0).SetScrollSpace(rect.GetHeight());
 
 		GetScrollBar(0).SetX(rect.right);
 		GetScrollBar(0).SetY(rect.top);
 		GetScrollBar(0).SetZ(GetBufferedZ());
 		GetScrollBar(0).SetLength(rect.bottom - rect.top);
 	}
 }
 
 CRect COList::GetListRect() const
 {
 	return m_CachedActualSize + CRect(0, m_HeadingHeight, 0, 0);
 }
 
 void COList::HandleMessage(SGUIMessage& Message)
 {
 	CList::HandleMessage(Message);
 
 	switch (Message.type)
 	{
 
 	case GUIM_SETTINGS_UPDATED:
 	{
 		if (Message.value.find("heading_") == 0)
 			SetupText();
 		break;
 	}
 
 	// If somebody clicks on the column heading
 	case GUIM_MOUSE_PRESS_LEFT:
 	{
 		if (!m_Sortable)
 			return;
 
 		const CVector2D& mouse = m_pGUI.GetMousePos();
 		if (!m_CachedActualSize.PointInside(mouse))
 			return;
 
 		float xpos = 0;
 		for (const COListColumn& column : m_Columns)
 		{
 			if (column.m_Hidden)
 				continue;
 
 			float width = column.m_Width;
 			// Check if it's a decimal value, and if so, assume relative positioning.
 			if (column.m_Width < 1 && column.m_Width > 0)
 				width *= m_TotalAvailableColumnWidth;
 			CVector2D leftTopCorner = m_CachedActualSize.TopLeft() + CVector2D(xpos, 0);
 			if (mouse.X >= leftTopCorner.X &&
 				mouse.X < leftTopCorner.X + width &&
 				mouse.Y < leftTopCorner.Y + m_HeadingHeight)
 			{
 				if (column.m_Id != static_cast<CStr>(m_SelectedColumn))
 				{
-					m_SelectedColumnOrder.Set(-1, true);
+					m_SelectedColumnOrder.Set(column.m_SortOrder, true);
 					CStr selected_column = column.m_Id;
 					m_SelectedColumn.Set(selected_column, true);
 				}
 				else
 					m_SelectedColumnOrder.Set(-m_SelectedColumnOrder, true);
 
 				ScriptEvent(EventNameSelectionColumnChange);
 				PlaySound(m_SoundSelected);
 				return;
 			}
 			xpos += width;
 		}
 		return;
 	}
 	default:
 		return;
 	}
 }
 
 bool COList::HandleAdditionalChildren(const XMBData& xmb, const XMBElement& child)
 {
 	#define ELMT(x) int elmt_##x = xmb.GetElementID(#x)
 	#define ATTR(x) int attr_##x = xmb.GetAttributeID(#x)
 	ELMT(item);
 	ELMT(column);
 	ELMT(translatableAttribute);
 	ATTR(id);
 	ATTR(context);
 
 	if (child.GetNodeName() == elmt_item)
 	{
 		CGUIString vlist;
 		vlist.SetValue(child.GetText().FromUTF8());
 		AddItem(vlist, vlist);
 		return true;
 	}
 	else if (child.GetNodeName() == elmt_column)
 	{
 		CStr id;
 		XERO_ITER_ATTR(child, attr)
 		{
 			if (attr.Name == attr_id)
 				id = attr.Value;
 		}
 
 		COListColumn column(this, id);
 
 		for (XMBAttribute attr : child.GetAttributes())
 		{
 			std::string_view attr_name(xmb.GetAttributeStringView(attr.Name));
 			CStr attr_value(attr.Value);
 
 			if (attr_name == "color")
 			{
 				if (!CGUI::ParseString<CGUIColor>(&m_pGUI, attr_value.FromUTF8(), column.m_TextColor))
 					LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.data(), attr_value.c_str());
 			}
 			else if (attr_name == "hidden")
 			{
 				bool hidden = false;
 				if (!CGUI::ParseString<bool>(&m_pGUI, attr_value.FromUTF8(), hidden))
 					LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.data(), attr_value.c_str());
 				else
 					column.m_Hidden.Set(hidden, false);
 			}
 			else if (attr_name == "width")
 			{
 				float width;
 				if (!CGUI::ParseString<float>(&m_pGUI, attr_value.FromUTF8(), width))
 					LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name.data(), attr_value.c_str());
 				else
 				{
 					// Check if it's a relative value, and save as decimal if so.
 					if (attr_value.find("%") != std::string::npos)
 						width = width / 100.f;
 					column.m_Width = width;
 				}
 			}
 			else if (attr_name == "heading")
 			{
 				column.m_Heading.Set(attr_value.FromUTF8(), false);
 			}
+			else if (attr_name == "sort_order")
+			{
+				column.m_SortOrder.Set(attr_value == "desc" ? -1 : 1, false);
+			}
 		}
 
 		for (XMBElement grandchild : child.GetChildNodes())
 		{
 			if (grandchild.GetNodeName() != elmt_translatableAttribute)
 				continue;
 
 			CStr attributeName(grandchild.GetAttributes().GetNamedItem(attr_id));
 			// only the heading is translatable for list column
 			if (attributeName.empty() || attributeName != "heading")
 			{
 				LOGERROR("GUI: translatable attribute in olist column that isn't a heading. (object: %s)", this->GetPresentableName().c_str());
 				continue;
 			}
 
 			CStr value(grandchild.GetText());
 			if (value.empty())
 				continue;
 
 			CStr context(grandchild.GetAttributes().GetNamedItem(attr_context)); // Read the context if any.
 			if (!context.empty())
 			{
 				CStr translatedValue(g_L10n.TranslateWithContext(context, value));
 				column.m_Heading.Set(translatedValue.FromUTF8(), false);
 			}
 			else
 			{
 				CStr translatedValue(g_L10n.Translate(value));
 				column.m_Heading.Set(translatedValue.FromUTF8(), false);
 			}
 		}
 
 		m_Columns.emplace_back(std::move(column));
 		return true;
 	}
 
 	return false;
 }
 
 void COList::AdditionalChildrenHandled()
 {
 	SetupText();
 }
 
 void COList::DrawList(CCanvas2D& canvas, const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
                       const CGUISpriteInstance& spriteSelectArea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor)
 {
 	CRect rect = GetListRect();
 
 	m_pGUI.DrawSprite(sprite, canvas, rect);
 
 	float scroll = 0.f;
 	if (m_ScrollBar)
 		scroll = GetScrollBar(0).GetPos();
 
 	bool drawSelected = false;
 	CRect rectSel;
 	// Draw item selection
 	if (selected != -1)
 	{
 		ENSURE(selected >= 0 && selected+1 < (int)m_ItemsYPositions.size());
 
 		// Get rectangle of selection:
 		rectSel = CRect(
 			rect.left, rect.top + m_ItemsYPositions[selected] - scroll,
 			rect.right, rect.top + m_ItemsYPositions[selected+1] - scroll);
 
 		if (rectSel.top <= rect.bottom &&
 			rectSel.bottom >= rect.top)
 		{
 			if (rectSel.bottom > rect.bottom)
 				rectSel.bottom = rect.bottom;
 			if (rectSel.top < rect.top)
 				rectSel.top = rect.top;
 
 			if (m_ScrollBar)
 			{
 				// Remove any overlapping area of the scrollbar.
 				if (rectSel.right > GetScrollBar(0).GetOuterRect().left &&
 					rectSel.right <= GetScrollBar(0).GetOuterRect().right)
 					rectSel.right = GetScrollBar(0).GetOuterRect().left;
 
 				if (rectSel.left >= GetScrollBar(0).GetOuterRect().left &&
 					rectSel.left < GetScrollBar(0).GetOuterRect().right)
 					rectSel.left = GetScrollBar(0).GetOuterRect().right;
 			}
 
 			// Draw item selection
 			m_pGUI.DrawSprite(spriteSelectArea, canvas, rectSel);
 			drawSelected = true;
 		}
 	}
 
 	// Draw line above column header
 	CRect rect_head(m_CachedActualSize.left, m_CachedActualSize.top, m_CachedActualSize.right,
 									m_CachedActualSize.top + m_HeadingHeight);
 	m_pGUI.DrawSprite(m_SpriteHeading, canvas, rect_head);
 
 	// Draw column headers
 	float xpos = 0;
 	size_t col = 0;
 	for (const COListColumn& column : m_Columns)
 	{
 		if (column.m_Hidden)
 		{
 			++col;
 			continue;
 		}
 
 		// Check if it's a decimal value, and if so, assume relative positioning.
 		float width = column.m_Width;
 		if (column.m_Width < 1 && column.m_Width > 0)
 			width *= m_TotalAvailableColumnWidth;
 
 		CVector2D leftTopCorner = m_CachedActualSize.TopLeft() + CVector2D(xpos, 0);
 
 		// Draw sort arrows in colum header
 		if (m_Sortable)
 		{
 			const CGUISpriteInstance* pSprite;
 			if (*m_SelectedColumn == column.m_Id)
 			{
 				if (m_SelectedColumnOrder == 0)
 					LOGERROR("selected_column_order must not be 0");
 
 				if (m_SelectedColumnOrder != -1)
 					pSprite = &*m_SpriteAsc;
 				else
 					pSprite = &*m_SpriteDesc;
 			}
 			else
 				pSprite = &*m_SpriteNotSorted;
 
 			m_pGUI.DrawSprite(*pSprite, canvas, CRect(leftTopCorner + CVector2D(width - SORT_SPRITE_DIM, 0), leftTopCorner + CVector2D(width, SORT_SPRITE_DIM)));
 		}
 
 		// Draw column header text
 		DrawText(canvas, col, textColor, leftTopCorner + COLUMN_SHIFT, rect_head);
 		xpos += width;
 		++col;
 	}
 
 	// Draw list items for each column
 	const size_t objectsCount = m_Columns.size();
 	for (size_t i = 0; i < m_List->m_Items.size(); ++i)
 	{
 		if (m_ItemsYPositions[i+1] - scroll < 0 ||
 			m_ItemsYPositions[i] - scroll > rect.GetHeight())
 			continue;
 
 		const float rowHeight = m_ItemsYPositions[i+1] - m_ItemsYPositions[i];
 
 		// Clipping area (we'll have to substract the scrollbar)
 		CRect cliparea = GetListRect();
 
 		if (m_ScrollBar)
 		{
 			if (cliparea.right > GetScrollBar(0).GetOuterRect().left &&
 				cliparea.right <= GetScrollBar(0).GetOuterRect().right)
 				cliparea.right = GetScrollBar(0).GetOuterRect().left;
 
 			if (cliparea.left >= GetScrollBar(0).GetOuterRect().left &&
 				cliparea.left < GetScrollBar(0).GetOuterRect().right)
 				cliparea.left = GetScrollBar(0).GetOuterRect().right;
 		}
 
 		// Draw all items for that column
 		xpos = 0;
 		for (size_t colIdx = 0; colIdx < m_Columns.size(); ++colIdx)
 		{
 			const COListColumn& column = m_Columns[colIdx];
 			if (column.m_Hidden)
 				continue;
 
 			// Determine text position and width
 			const CVector2D textPos = rect.TopLeft() + CVector2D(xpos, -scroll + m_ItemsYPositions[i]);
 
 			float width = column.m_Width;
 			// Check if it's a decimal value, and if so, assume relative positioning.
 			if (column.m_Width < 1 && column.m_Width > 0)
 				width *= m_TotalAvailableColumnWidth;
 
 			// Clip text to the column (to prevent drawing text into the neighboring column)
 			CRect cliparea2 = cliparea;
 			cliparea2.right = std::min(cliparea2.right, textPos.X + width);
 			cliparea2.bottom = std::min(cliparea2.bottom, textPos.Y + rowHeight);
 
 			// Draw list item
 			DrawText(canvas, objectsCount * (i +/*Heading*/1) + colIdx, column.m_TextColor, textPos, cliparea2);
 			xpos += width;
 		}
 	}
 
 	// Draw scrollbars on top of the content
 	if (m_ScrollBar)
 		IGUIScrollBarOwner::Draw(canvas);
 
 	// Draw the overlays last
 	m_pGUI.DrawSprite(spriteOverlay, canvas, rect);
 	if (drawSelected)
 		m_pGUI.DrawSprite(spriteSelectAreaOverlay, canvas, rectSel);
 }
Index: ps/trunk/source/gui/ObjectTypes/COList.h
===================================================================
--- ps/trunk/source/gui/ObjectTypes/COList.h	(revision 27397)
+++ ps/trunk/source/gui/ObjectTypes/COList.h	(revision 27398)
@@ -1,98 +1,99 @@
 /* Copyright (C) 2023 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef INCLUDED_COLIST
 #define INCLUDED_COLIST
 
 #include "gui/ObjectTypes/CList.h"
 #include "gui/SettingTypes/CGUIColor.h"
 
 #include <vector>
 
 /**
  * Represents a column.
  */
 class COListColumn
 {
 public:
 	COListColumn(IGUIObject* owner, const CStr& cid)
 		: m_Id(cid), m_Width(0), m_Heading(owner, "heading_" + cid), m_List(owner, "list_" + cid),
-		m_Hidden(owner, "hidden_" + cid, false)
+		m_Hidden(owner, "hidden_" + cid, false), m_SortOrder(owner, " sort_order_" + cid, -1)
 	{}
 	// Avoid copying the strings.
 	NONCOPYABLE(COListColumn);
 	MOVABLE(COListColumn);
 	CGUIColor m_TextColor;
 	CStr m_Id;
 	float m_Width;
 	CGUISimpleSetting<CStrW> m_Heading; // CGUIString??
 	CGUISimpleSetting<CGUIList> m_List;
 	CGUISimpleSetting<bool> m_Hidden;
+	CGUISimpleSetting<i32> m_SortOrder;
 };
 
 /**
  * Multi-column list. One row can be selected by the user.
  * Individual cells are clipped if the contained text is too long.
  *
  * The list can be sorted dynamically by JS code when a
  * heading is clicked.
  * A scroll-bar will appear when needed.
  */
 class COList : public CList
 {
 	GUI_OBJECT(COList)
 
 public:
 	COList(CGUI& pGUI);
 
 protected:
 	void SetupText();
 	void HandleMessage(SGUIMessage& Message);
 
 	/**
 	 * Handle the \<item\> tag.
 	 */
 	virtual bool HandleAdditionalChildren(const XMBData& xmb, const XMBElement& child);
 	virtual void AdditionalChildrenHandled();
 
 	virtual void DrawList(
 		CCanvas2D& canvas, const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
 		const CGUISpriteInstance& spriteSelectarea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor);
 
 	virtual CRect GetListRect() const;
 
 	/**
 	 * Available columns.
 	 */
 	std::vector<COListColumn> m_Columns;
 
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteHeading;
 	CGUISimpleSetting<bool> m_Sortable;
 	CGUISimpleSetting<CStr> m_SelectedColumn;
 	CGUISimpleSetting<i32> m_SelectedColumnOrder;
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteAsc;
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteDesc;
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteNotSorted;
 
 private:
 	static const CStr EventNameSelectionColumnChange;
 
 	// Width of space available for columns
 	float m_TotalAvailableColumnWidth;
 	float m_HeadingHeight;
 };
 
 #endif // INCLUDED_COLIST