Add skin attributes for listbox focused items and allow customization of the fade...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / skinlist.qc

diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc
index 8a75ee206ed5252c7ed8f20764d332766455a80a..d689295ae8bad379b050985a64705436db9fad3b 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.qc
+++ b/qcsrc/menu/xonotic/skinlist.qc
@@ -3,7 +3,7 @@ CLASS(XonoticSkinList) EXTENDS(XonoticListBox)
        METHOD(XonoticSkinList, configureXonoticSkinList, void(entity))
        ATTRIB(XonoticSkinList, rowsPerItem, float, 4)
        METHOD(XonoticSkinList, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(XonoticSkinList, drawListBoxItem, void(entity, float, vector, float))
+       METHOD(XonoticSkinList, drawListBoxItem, void(entity, int, vector, bool, float))
        METHOD(XonoticSkinList, getSkins, void(entity))
        METHOD(XonoticSkinList, setSkin, void(entity))
        METHOD(XonoticSkinList, loadCvars, void(entity))
@@ -86,7 +86,7 @@ void XonoticSkinList_getSkins(entity me)
        string s;
 
        buf = buf_create();
-       glob = search_begin("gfx/menu/*/skinvalues.txt", TRUE, TRUE);
+       glob = search_begin("gfx/menu/*/skinvalues.txt", true, true);
        if(glob < 0)
        {
                me.skinlist = buf;
@@ -149,12 +149,14 @@ void XonoticSkinList_resizeNotify(entity me, vector relOrigin, vector relSize, v
        me.columnNameSize = 1 - me.columnPreviewSize - 2 * me.realFontSize.x;
 }
 
-void XonoticSkinList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticSkinList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, float highlightedTime)
 {
        string s;
 
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+       else if(highlightedTime)
+               draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, getHighlightAlpha(SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED, highlightedTime));
 
        s = me.skinParameter(me, i, SKINPARM_PREVIEW);
        draw_Picture(me.columnPreviewOrigin * eX, s, me.columnPreviewSize * eX + eY, '1 1 1', 1);
@@ -181,12 +183,15 @@ void SetSkin_Click(entity btn, entity me)
 
 void XonoticSkinList_doubleClickListBoxItem(entity me, float i, vector where)
 {
+       m_play_click_sound(MENU_SOUND_EXECUTE);
        me.setSkin(me);
 }
 
 float XonoticSkinList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER || scan == K_KP_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER)
+       {
+               m_play_click_sound(MENU_SOUND_EXECUTE);
                me.setSkin(me);
                return 1;
        }