Ticket #3574: t3574_list_item_doubleclicks_v1.patch

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

@@ -171 +171 @@
         <!-- Middle panel: Filters, game list, chat box. -->
         <object name="middlePanel" size="20%+5 5% 100%-255 97.2%">
             <object name="gamesBox" style="ModernList" sprite_asc="ModernArrowDown" default_column="name" sprite_desc="ModernArrowUp" sprite_not_sorted="ModernNotSorted" type="olist" sortable="true" size="0 25 100% 48%" font="sans-stroke-13">
                 <action on="SelectionChange">updateGameSelection();</action>
                 <action on="SelectionColumnChange">updateGameListOrderSelection();</action>
-                <action on="mouseleftdoubleclick">joinSelectedGame();</action>
+                <action on="mouseleftdoubleclick_item">joinSelectedGame();</action>
                 <def id="name" color="0 60 0" width="27%">
                     <translatableAttribute id="heading">Name</translatableAttribute>
                 </def>
                 <!--<def id="ip" heading="IP" color="0 128 128" width="170"/>-->
                 <def id="mapName" color="128 128 128" width="25%">

binaries/data/mods/public/gui/replaymenu/replay_menu.xml

@@ -62 +62 @@
             <!-- Replay List in that left panel -->
             <object name="replaySelection" size="0 35 100% 100%" style="ModernList" type="olist" sortable="true" default_column="name" sprite_asc="ModernArrowDown" sprite_desc="ModernArrowUp" sprite_not_sorted="ModernNotSorted" font="sans-stroke-13">
 
                 <action on="SelectionChange">displayReplayDetails();</action>
                 <action on="SelectionColumnChange">displayReplayList();</action>
-                <action on="mouseleftdoubleclick">startReplay();</action>
+                <action on="mouseleftdoubleclick_item">startReplay();</action>
 
                 <!-- Columns -->
                 <!-- We have to call one "name" as the GUI expects one. -->
                 <def id="name" color="172 172 212" width="12%">
                     <translatableAttribute id="heading" context="replay">Date / Time</translatableAttribute>

source/gui/CGUI.h

@@ -42 +42 @@
 
 #include <boost/unordered_set.hpp>
 
 ERROR_TYPE(GUI, JSOpenFailed);
 
+extern const double SELECT_DBLCLICK_RATE;
+
 /**
  * Contains a list of values for new defaults to objects.
  */
 struct SGUIStyle
 {

source/gui/CList.cpp

@@ -25 +25 @@
 #include "ps/CLogger.h"
 #include "soundmanager/ISoundManager.h"
 
 
 CList::CList()
-    : m_Modified(false)
+    : m_Modified(false), m_PrevSelectedItem(-1), m_LastItemClickTime(0)
 {
     // Add sprite_disabled! TODO
 
     AddSetting(GUIST_float,                 "buffer_zone");
     AddSetting(GUIST_CStrW,                 "font");
@@ -214 +214 @@
             UpdateAutoScroll();
 
             CStrW soundPath;
             if (g_SoundManager && GUI<CStrW>::GetSetting(this, "sound_selected", soundPath) == PSRETURN_OK && !soundPath.empty())
                 g_SoundManager->PlayAsUI(soundPath.c_str(), false);
+
+            if (timer_Time() - m_LastItemClickTime < SELECT_DBLCLICK_RATE && set == m_PrevSelectedItem)
+                this->SendEvent(GUIM_MOUSE_DBLCLICK_LEFT_ITEM, "mouseleftdoubleclick_item");
+            m_LastItemClickTime = timer_Time();
+            m_PrevSelectedItem = set;
         }
         break;
     }
 
     case GUIM_LOAD:

source/gui/CList.h

@@ -106 +106 @@
     std::vector<float> m_ItemsYPositions;
 
 private:
     // Whether the list's items have been modified since last handling a message.
     bool m_Modified;
+
+    // Used for doubleclick registration
+    int m_PrevSelectedItem;
+
+    // Last time a click on an item was issued
+    double m_LastItemClickTime;
 };
 
 #endif // INCLUDED_CLIST

source/gui/GUIbase.h

@@ -62 +62 @@
     GUIM_MOUSE_PRESS_LEFT,
     GUIM_MOUSE_PRESS_RIGHT,
     GUIM_MOUSE_DOWN_LEFT,
     GUIM_MOUSE_DOWN_RIGHT,
     GUIM_MOUSE_DBLCLICK_LEFT,
+    GUIM_MOUSE_DBLCLICK_LEFT_ITEM, // Triggered when doubleclicking on a list item
     GUIM_MOUSE_DBLCLICK_RIGHT,
     GUIM_MOUSE_RELEASE_LEFT,
     GUIM_MOUSE_RELEASE_RIGHT,
     GUIM_MOUSE_WHEEL_UP,
     GUIM_MOUSE_WHEEL_DOWN,