X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fmaplist.c;h=60eeb445c6c4877caf508aa145ccf9c403d9e5ef;hb=935f38b6d41fb6e2579a4ee1e7c6fb0d063e5869;hp=a63354712aa9119e3764306df2e3a973b87568a2;hpb=3f6354bf7f3019a80e13ca7536b9300226dd86fb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c index a63354712..60eeb445c 100644 --- a/qcsrc/menu/xonotic/maplist.c +++ b/qcsrc/menu/xonotic/maplist.c @@ -142,25 +142,24 @@ void XonoticMapList_resizeNotify(entity me, vector relOrigin, vector relSize, ve 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; - } + { + 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) @@ -301,13 +300,13 @@ 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_ENTER || scan == K_KP_ENTER) + 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); DialogOpenButton_Click_withCoords(NULL, main.mapInfoDialog, me.origin + eX * (me.columnNameOrigin * me.size_x) + eY * ((me.itemHeight * me.selectedItem - me.scrollPos) * me.size_y), eY * me.itemAbsSize_y + eX * (me.itemAbsSize_x * me.columnNameSize)); } - else if(scan == K_SPACE) + else if(scan == K_MOUSE3 || scan == K_INS || scan == K_KP_INS) { me.g_maplistCacheToggle(me, me.selectedItem); }