From: Severin Meyer <sev.ch@web.de>
Date: Sat, 11 Oct 2014 08:06:40 +0000 (+0200)
Subject: Also accept DoubleClick/ENTER to open the map info dialog
X-Git-Tag: xonotic-v0.8.0~147^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ea3a0186cfe2d8440e084ef1b915c01236589981;p=xonotic%2Fxonotic-data.pk3dir.git

Also accept DoubleClick/ENTER to open the map info dialog
---

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index eacfb42e7..60eeb445c 100644
--- a/qcsrc/menu/xonotic/maplist.c
+++ b/qcsrc/menu/xonotic/maplist.c
@@ -144,6 +144,22 @@ void XonoticMapList_clickListBoxItem(entity me, float i, vector where)
 	if(where_x <= me.columnPreviewOrigin + me.columnPreviewSize)
 		if(where_x >= 0)
 			me.g_maplistCacheToggle(me, i);
+
+	if(where_x >= me.columnNameOrigin)
+		if(where_x <= 1)
+		{
+			if(i == me.lastClickedMap)
+				if(time < me.lastClickedTime + 0.3)
+				{
+					// DOUBLE CLICK!
+					// pop up map info screen
+					main.mapInfoDialog.loadMapInfo(main.mapInfoDialog, i, me);
+					DialogOpenButton_Click_withCoords(NULL, main.mapInfoDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * i - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize));
+					return;
+				}
+			me.lastClickedMap = i;
+			me.lastClickedTime = time;
+		}
 }
 
 void XonoticMapList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
@@ -284,7 +300,7 @@ float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
 	string ch, save;
 	if(me.nItems <= 0)
 		return SUPER(XonoticMapList).keyDown(me, scan, ascii, shift);
-	if(scan == K_MOUSE2 || scan == K_SPACE)
+	if(scan == K_MOUSE2 || scan == K_SPACE || scan == K_ENTER || scan == K_KP_ENTER)
 	{
 		// pop up map info screen
 		main.mapInfoDialog.loadMapInfo(main.mapInfoDialog, me.selectedItem, me);