Merge branch 'master' into terencehill/menu_listbox_changes

[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 6d11fe9c6574eaf510d2e94ab23b5446b07ced01..d505a2894e4790050dfba4cce9c85d368cc31641 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.qc
+++ b/qcsrc/menu/xonotic/skinlist.qc
@@ -1,9 +1,11 @@
-#ifdef INTERFACE
-CLASS(XonoticSkinList) EXTENDS(XonoticListBox)
+#ifndef SKINLIST_H
+#define SKINLIST_H
+#include "listbox.qc"
+CLASS(XonoticSkinList, 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, bool))
        METHOD(XonoticSkinList, getSkins, void(entity))
        METHOD(XonoticSkinList, setSkin, void(entity))
        METHOD(XonoticSkinList, loadCvars, void(entity))
@@ -42,7 +44,7 @@ const float SKINPARM_COUNT = 4;
 entity makeXonoticSkinList()
 {
        entity me;
-       me = spawnXonoticSkinList();
+       me = NEW(XonoticSkinList);
        me.configureXonoticSkinList(me);
        return me;
 }
@@ -64,7 +66,7 @@ void XonoticSkinList_loadCvars(entity me)
        {
                if(me.skinParameter(me, i, SKINPARM_NAME) == s)
                {
-                       me.selectedItem = i;
+                       me.setSelected(me, i);
                        break;
                }
        }
@@ -83,10 +85,10 @@ string XonoticSkinList_skinParameter(entity me, float i, float key)
 void XonoticSkinList_getSkins(entity me)
 {
        float glob, buf, i, n, fh;
-       string s;
+       string s, name;
 
        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;
@@ -98,7 +100,8 @@ void XonoticSkinList_getSkins(entity me)
        for(i = 0; i < n; ++i)
        {
                s = search_getfilename(glob, i);
-               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_NAME, substring(s, 9, strlen(s) - 24)); // the * part
+               name = substring(s, 9, strlen(s) - 24); // the * part
+               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_NAME, name);
                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, _("<TITLE>"));
                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, _("<AUTHOR>"));
                if(draw_PictureSize(strcat("/gfx/menu/", substring(s, 9, strlen(s) - 24), "/skinpreview")) == '0 0 0')
@@ -115,7 +118,12 @@ void XonoticSkinList_getSkins(entity me)
                {
                        // these two are handled by skinlist.qc
                        if(substring(s, 0, 6) == "title ")
-                               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, substring(s, 6, strlen(s) - 6));
+                       {
+                               if (name == cvar_defstring("menu_skin"))
+                                       bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, strcat(substring(s, 6, strlen(s) - 6), " (", _("Default"), ")"));
+                               else
+                                       bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, substring(s, 6, strlen(s) - 6));
+                       }
                        else if(substring(s, 0, 7) == "author ")
                                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, substring(s, 7, strlen(s) - 7));
                }
@@ -138,23 +146,28 @@ void XonoticSkinList_resizeNotify(entity me, vector relOrigin, vector relSize, v
        me.itemAbsSize = '0 0 0';
        SUPER(XonoticSkinList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
-       me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));
-       me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));
-       me.realUpperMargin1 = 0.5 * (1 - 2.5 * me.realFontSize_y);
-       me.realUpperMargin2 = me.realUpperMargin1 + 1.5 * me.realFontSize_y;
+       me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize.y * me.itemHeight));
+       me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize.x * (1 - me.controlWidth)));
+       me.realUpperMargin1 = 0.5 * (1 - 2.5 * me.realFontSize.y);
+       me.realUpperMargin2 = me.realUpperMargin1 + 1.5 * me.realFontSize.y;
 
        me.columnPreviewOrigin = 0;
-       me.columnPreviewSize = me.itemAbsSize_y / me.itemAbsSize_x * 4 / 3;
-       me.columnNameOrigin = me.columnPreviewOrigin + me.columnPreviewSize + me.realFontSize_x;
-       me.columnNameSize = 1 - me.columnPreviewSize - 2 * me.realFontSize_x;
+       me.columnPreviewSize = me.itemAbsSize.y / me.itemAbsSize.x * 4 / 3;
+       me.columnNameOrigin = me.columnPreviewOrigin + me.columnPreviewSize + me.realFontSize.x;
+       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, bool isFocused)
 {
        string s;
 
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+       else if(isFocused)
+       {
+               me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+               draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+       }
 
        s = me.skinParameter(me, i, SKINPARM_PREVIEW);
        draw_Picture(me.columnPreviewOrigin * eX, s, me.columnPreviewSize * eX + eY, '1 1 1', 1);
@@ -181,12 +194,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;
        }