Listbox: highlight item under the cursor

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

diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc
index 5345e631335ad9cbe1842409c6265b9db6db2ae4..9d217fc514e463a5a6566889f287dde15f9c5c53 100644 (file)
--- a/qcsrc/menu/xonotic/languagelist.qc
+++ b/qcsrc/menu/xonotic/languagelist.qc
@@ -2,7 +2,7 @@
 CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
        ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
 CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
        ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)

-       METHOD(XonoticLanguageList, drawListBoxItem, void(entity, float, vector, float))
+       METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, float))

        METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticLanguageList, setSelected, void(entity, float))
        METHOD(XonoticLanguageList, loadCvars, void(entity))
        METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticLanguageList, setSelected, void(entity, float))
        METHOD(XonoticLanguageList, loadCvars, void(entity))


@@ -55,16 +55,18 @@ void XonoticLanguageList_configureXonoticLanguageList(entity me)
        me.loadCvars(me);
 }
 
        me.loadCvars(me);
 }
 

-void XonoticLanguageList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticLanguageList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, float highlightedTime)

 {
        string s, p;
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
 {
        string s, p;
        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_SELECTED, getHighlightAlpha(SKINALPHA_LISTBOX_SELECTED * 0.1, highlightedTime));

 
        s = me.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
 
        vector save_fontscale = draw_fontscale;
 
        s = me.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
 
        vector save_fontscale = draw_fontscale;

-       float f = draw_CondensedFontFactor(s, FALSE, me.realFontSize, 1);
+       float f = draw_CondensedFontFactor(s, false, me.realFontSize, 1);

        draw_fontscale.x *= f;
        vector fs = me.realFontSize;
        fs.x *= f;
        draw_fontscale.x *= f;
        vector fs = me.realFontSize;
        fs.x *= f;


@@ -75,7 +77,7 @@ void XonoticLanguageList_drawListBoxItem(entity me, float i, vector absSize, flo
        if(p != "")
        {
                vector save_fontscale = draw_fontscale;
        if(p != "")
        {
                vector save_fontscale = draw_fontscale;

-               float f = draw_CondensedFontFactor(p, FALSE, me.realFontSize, 1);
+               float f = draw_CondensedFontFactor(p, false, me.realFontSize, 1);

                draw_fontscale.x *= f;
                vector fs = me.realFontSize;
                fs.x *= f;
                draw_fontscale.x *= f;
                vector fs = me.realFontSize;
                fs.x *= f;


@@ -140,12 +142,15 @@ void XonoticLanguageList_saveCvars(entity me)
 
 void XonoticLanguageList_doubleClickListBoxItem(entity me, float i, vector where)
 {
 
 void XonoticLanguageList_doubleClickListBoxItem(entity me, float i, vector where)
 {

+       m_play_click_sound(MENU_SOUND_EXECUTE);

        me.setLanguage(me);
 }
 
 float XonoticLanguageList_keyDown(entity me, float scan, float ascii, float shift)
 {
        me.setLanguage(me);
 }
 
 float XonoticLanguageList_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.setLanguage(me);
                return 1;
        }
                me.setLanguage(me);
                return 1;
        }