X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdemolist.qc;h=0addd6cbedda7d2bc2f7402b3f9abff336cbfde6;hp=6882fcc5eb78b2d49d6733639fd18b31b2298eea;hb=62d736d8c3a51baf5fa3a4265e39a2b773704a91;hpb=f2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d

diff --git a/qcsrc/menu/xonotic/demolist.qc b/qcsrc/menu/xonotic/demolist.qc
index 6882fcc5e..0addd6cbe 100644
--- a/qcsrc/menu/xonotic/demolist.qc
+++ b/qcsrc/menu/xonotic/demolist.qc
@@ -1,44 +1,11 @@
-#ifdef INTERFACE
-CLASS(XonoticDemoList) EXTENDS(XonoticListBox)
-	METHOD(XonoticDemoList, configureXonoticDemoList, void(entity))
-	ATTRIB(XonoticDemoList, rowsPerItem, float, 1)
-	METHOD(XonoticDemoList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticDemoList, drawListBoxItem, void(entity, float, vector, float))
-	METHOD(XonoticDemoList, getDemos, void(entity))
-	METHOD(XonoticDemoList, startDemo, void(entity))
-	METHOD(XonoticDemoList, timeDemo, void(entity))
-	METHOD(XonoticDemoList, demoName, string(entity, float))
-	METHOD(XonoticDemoList, doubleClickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticDemoList, keyDown, float(entity, float, float, float))
-	METHOD(XonoticDemoList, destroy, void(entity))
-	METHOD(XonoticDemoList, showNotify, void(entity))
-
-	ATTRIB(XonoticDemoList, listDemo, float, -1)
-	ATTRIB(XonoticDemoList, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticDemoList, columnNameOrigin, float, 0)
-	ATTRIB(XonoticDemoList, columnNameSize, float, 0)
-	ATTRIB(XonoticDemoList, realUpperMargin, float, 0)
-	ATTRIB(XonoticDemoList, origin, vector, '0 0 0')
-	ATTRIB(XonoticDemoList, itemAbsSize, vector, '0 0 0')
-
-	ATTRIB(XonoticDemoList, filterString, string, string_null)
-ENDCLASS(XonoticDemoList)
-
-#ifndef IMPLEMENTATION
-// public:
-entity demolist; // for reference elsewhere
-entity makeXonoticDemoList();
-#endif
-void DemoList_Refresh_Click(entity btn, entity me);
-void DemoList_Filter_Change(entity box, entity me);
-#endif
-
-#ifdef IMPLEMENTATION
+#include "demolist.qh"
+
+#include "inputbox.qh"
 
 entity makeXonoticDemoList()
 {
 	entity me;
-	me = spawnXonoticDemoList();
+	me = NEW(XonoticDemoList);
 	me.configureXonoticDemoList(me);
 	return me;
 }
@@ -46,7 +13,7 @@ entity makeXonoticDemoList()
 void XonoticDemoList_configureXonoticDemoList(entity me)
 {
 	me.configureXonoticListBox(me);
-	me.getDemos(me);
+	me.nItems = 0;
 }
 
 string XonoticDemoList_demoName(entity me, float i)
@@ -125,19 +92,26 @@ void XonoticDemoList_resizeNotify(entity me, vector relOrigin, vector relSize, v
 	me.itemAbsSize = '0 0 0';
 	SUPER(XonoticDemoList).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.itemAbsSize.y = absSize.y * me.itemHeight;
+	me.itemAbsSize.x = absSize.x * (1 - me.controlWidth);
+	me.realFontSize.y = me.fontSize / me.itemAbsSize.y;
+	me.realFontSize.x = me.fontSize / me.itemAbsSize.x;
 	me.realUpperMargin = 0.5 * (1 - me.realFontSize.y);
 
 	me.columnNameOrigin = me.realFontSize.x;
 	me.columnNameSize = 1 - 2 * me.realFontSize.x;
 }
 
-void XonoticDemoList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticDemoList_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.demoName(me,i);
 	s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
@@ -157,8 +131,7 @@ void DemoList_Refresh_Click(entity btn, entity me)
 
 void DemoList_Filter_Change(entity box, entity me)
 {
-	if(me.filterString)
-		strunzone(me.filterString);
+	strfree(me.filterString);
 
 	if(box.text != "")
 	{
@@ -225,5 +198,3 @@ float XonoticDemoList_keyDown(entity me, float scan, float ascii, float shift)
 		return SUPER(XonoticDemoList).keyDown(me, scan, ascii, shift);
 	}
 }
-#endif
-