X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Flanguagelist.qc;h=0b7281dbff13f3cd1e3fc25b69ef229a43da989e;hp=367da94dfb5df0ad26d6f001866c77896da4415b;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hpb=fbb96108e5828a7557694db4469c2d0d7c582846

diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc
index 367da94dfb..0b7281dbff 100644
--- a/qcsrc/menu/xonotic/languagelist.qc
+++ b/qcsrc/menu/xonotic/languagelist.qc
@@ -2,13 +2,13 @@
 #define LANGUAGELIST_H
 #include "listbox.qc"
 CLASS(XonoticLanguageList, XonoticListBox)
-	METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
+	METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity));
 	ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
-	METHOD(XonoticLanguageList, drawListBoxItem, void(entity, float, vector, float))
-	METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticLanguageList, setSelected, void(entity, float))
-	METHOD(XonoticLanguageList, loadCvars, void(entity))
-	METHOD(XonoticLanguageList, saveCvars, void(entity))
+	METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, bool));
+	METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector));
+	METHOD(XonoticLanguageList, setSelected, void(entity, float));
+	METHOD(XonoticLanguageList, loadCvars, void(entity));
+	METHOD(XonoticLanguageList, saveCvars, void(entity));
 
 	ATTRIB(XonoticLanguageList, realFontSize, vector, '0 0 0')
 	ATTRIB(XonoticLanguageList, realUpperMargin, float, 0)
@@ -17,15 +17,15 @@ CLASS(XonoticLanguageList, XonoticListBox)
 	ATTRIB(XonoticLanguageList, columnPercentageOrigin, float, 0)
 	ATTRIB(XonoticLanguageList, columnPercentageSize, float, 0)
 
-	METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)) // enter handling
+	METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector));
+	METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float)); // enter handling
 
-	METHOD(XonoticLanguageList, destroy, void(entity))
+	METHOD(XonoticLanguageList, destroy, void(entity));
 
 	ATTRIB(XonoticLanguageList, languagelist, float, -1)
-	METHOD(XonoticLanguageList, getLanguages, void(entity))
-	METHOD(XonoticLanguageList, setLanguage, void(entity))
-	METHOD(XonoticLanguageList, languageParameter, string(entity, float, float))
+	METHOD(XonoticLanguageList, getLanguages, void(entity));
+	METHOD(XonoticLanguageList, setLanguage, void(entity));
+	METHOD(XonoticLanguageList, languageParameter, string(entity, float, float));
 
 	ATTRIB(XonoticLanguageList, name, string, "languageselector") // change this to make it noninteractive (for first run dialog)
 ENDCLASS(XonoticLanguageList)
@@ -57,11 +57,16 @@ void XonoticLanguageList_configureXonoticLanguageList(entity 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, bool isFocused)
 {
 	string s, p;
 	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.languageParameter(me, i, LANGPARM_NAME_LOCALIZED);
 
@@ -116,17 +121,17 @@ void XonoticLanguageList_loadCvars(entity me)
 	{
 		if(me.languageParameter(me, i, LANGPARM_ID) == "en")
 		{
-			me.selectedItem = i;
+			SUPER(XonoticLanguageList).setSelected(me, i);
 			break;
 		}
 	}
 
-        // otherwise, find the language
+	// otherwise, find the language
 	for(i = 0; i < n; ++i)
 	{
 		if(me.languageParameter(me, i, LANGPARM_ID) == s)
 		{
-			me.selectedItem = i;
+			SUPER(XonoticLanguageList).setSelected(me, i);
 			break;
 		}
 	}