X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fsoundlist.qc;h=159cd76c53d60a2bfe8c3b3c73c9fea6a74b9679;hb=21307f327df5609b82d90496c1c6156d636d1c8d;hp=bba66d19d16a651f50ceb5be5ac5a4fd441e67c3;hpb=9eb82dd6fc682e3ddecd471835f9047816236342;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/soundlist.qc b/qcsrc/menu/xonotic/soundlist.qc
index bba66d19d..159cd76c5 100644
--- a/qcsrc/menu/xonotic/soundlist.qc
+++ b/qcsrc/menu/xonotic/soundlist.qc
@@ -2,16 +2,16 @@
 #define SOUNDLIST_H
 #include "listbox.qc"
 CLASS(XonoticSoundList, XonoticListBox)
-	METHOD(XonoticSoundList, configureXonoticSoundList, void(entity))
+	METHOD(XonoticSoundList, configureXonoticSoundList, void(entity));
 	ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
-	METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticSoundList, drawListBoxItem, void(entity, float, vector, float))
-	METHOD(XonoticSoundList, getSounds, void(entity))
-	METHOD(XonoticSoundList, soundName, string(entity, float))
-	METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticSoundList, keyDown, float(entity, float, float, float))
-	METHOD(XonoticSoundList, destroy, void(entity))
-	METHOD(XonoticSoundList, showNotify, void(entity))
+	METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector));
+	METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool));
+	METHOD(XonoticSoundList, getSounds, void(entity));
+	METHOD(XonoticSoundList, soundName, string(entity, float));
+	METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector));
+	METHOD(XonoticSoundList, keyDown, float(entity, float, float, float));
+	METHOD(XonoticSoundList, destroy, void(entity));
+	METHOD(XonoticSoundList, showNotify, void(entity));
 
 	ATTRIB(XonoticSoundList, listSound, float, -1)
 	ATTRIB(XonoticSoundList, realFontSize, vector, '0 0 0')
@@ -24,7 +24,7 @@ CLASS(XonoticSoundList, XonoticListBox)
 	ATTRIB(XonoticSoundList, itemAbsSize, vector, '0 0 0')
 
 	ATTRIB(XonoticSoundList, filterString, string, string_null)
-	ATTRIB(XonoticSoundList, playlist, entity, world)
+	ATTRIB(XonoticSoundList, playlist, entity, NULL)
 ENDCLASS(XonoticSoundList)
 
 entity makeXonoticSoundList();
@@ -103,11 +103,16 @@ void XonoticSoundList_resizeNotify(entity me, vector relOrigin, vector relSize,
 	me.columnNameSize = 1 - me.columnNameOrigin - me.realFontSize.x;
 }
 
-void XonoticSoundList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticSoundList_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.soundName(me,i);
 	if(s == cvar_string("menu_cdtrack")) // current menu track