X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game.qh;h=c0965c23249470b0e686ddbcb68822abecc1b2b1;hb=d61f14d267403be7c2cce3f178d557884dc2bef0;hp=c415e96732cee4c6c796ae4d8cc64bde5006be3c;hpb=37cf62041a76248472ef6a78feaaed33e35a2260;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qh b/qcsrc/menu/xonotic/dialog_settings_game.qh
index c415e9673..c0965c232 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qh
@@ -9,19 +9,19 @@ ENDCLASS(SettingSource)
 
 #include "listbox.qh"
 CLASS(XonoticRegisteredSettingsList, XonoticListBox)
-	ATTRIB(XonoticRegisteredSettingsList, alphaBG, float, 0)
-	ATTRIB(XonoticRegisteredSettingsList, itemAbsSize, vector, '0 0 0')
-	ATTRIB(XonoticRegisteredSettingsList, origin, vector, '0 0 0')
-	ATTRIB(XonoticRegisteredSettingsList, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticRegisteredSettingsList, realUpperMargin, float, 0)
-	ATTRIB(XonoticRegisteredSettingsList, rowsPerItem, float, 2)
-	ATTRIB(XonoticRegisteredSettingsList, stringFilterBox, entity, NULL)
-	ATTRIB(XonoticRegisteredSettingsList, stringFilter, string, string_null)
-	ATTRIB(XonoticRegisteredSettingsList, typeToSearchString, string, string_null)
-	ATTRIB(XonoticRegisteredSettingsList, typeToSearchTime, float, 0)
-	ATTRIB(XonoticRegisteredSettingsList, source, DataSource, NULL)
-	ATTRIB(XonoticRegisteredSettingsList, onChange, void(entity, entity), func_null)
-	ATTRIB(XonoticRegisteredSettingsList, onChangeEntity, entity, NULL)
+	ATTRIB(XonoticRegisteredSettingsList, alphaBG, float, 0);
+	ATTRIB(XonoticRegisteredSettingsList, itemAbsSize, vector, '0 0 0');
+	ATTRIB(XonoticRegisteredSettingsList, origin, vector, '0 0 0');
+	ATTRIB(XonoticRegisteredSettingsList, realFontSize, vector, '0 0 0');
+	ATTRIB(XonoticRegisteredSettingsList, realUpperMargin, float, 0);
+	ATTRIB(XonoticRegisteredSettingsList, rowsPerItem, float, 2);
+	ATTRIB(XonoticRegisteredSettingsList, stringFilterBox, entity);
+	ATTRIB(XonoticRegisteredSettingsList, stringFilter, string);
+	ATTRIB(XonoticRegisteredSettingsList, typeToSearchString, string);
+	ATTRIB(XonoticRegisteredSettingsList, typeToSearchTime, float, 0);
+	ATTRIB(XonoticRegisteredSettingsList, source, DataSource);
+	ATTRIB(XonoticRegisteredSettingsList, onChange, void(entity, entity));
+	ATTRIB(XonoticRegisteredSettingsList, onChangeEntity, entity);
 	METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity));
 	METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused));
 	METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this));
@@ -32,14 +32,18 @@ CLASS(XonoticRegisteredSettingsList, XonoticListBox)
 ENDCLASS(XonoticRegisteredSettingsList)
 
 #include "tab.qh"
+#include "scrollpanel.qh"
 CLASS(XonoticGameSettingsTab, XonoticTab)
-	ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
-	ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)
-	ATTRIB(XonoticGameSettingsTab, source, DataSource, NEW(SettingSource))
-	ATTRIB(XonoticGameSettingsTab, topicList, entity, NEW(XonoticRegisteredSettingsList, this.source))
-	ATTRIB(XonoticGameSettingsTab, currentPanel, entity, NEW(XonoticTab))
-	ATTRIB(XonoticGameSettingsTab, currentItem, entity, NULL)
+	ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9);
+	ATTRIB(XonoticGameSettingsTab, rows, float, 15.5);
+	ATTRIB(XonoticGameSettingsTab, columns, float, 6.5);
+	ATTRIB(XonoticGameSettingsTab, source, DataSource, NEW(SettingSource));
+	ATTRIB(XonoticGameSettingsTab, topicList, entity, NEW(XonoticRegisteredSettingsList, this.source));
+	// XonoticScrollPanel disabled because it's broken, see https://gitlab.com/xonotic/xonotic-data.pk3dir/merge_requests/548
+	// It will probably require a different implementation since XonoticScrollPanel should be an instance of Container, not ListBox
+	//ATTRIB(XonoticGameSettingsTab, currentPanel, entity, NEW(XonoticScrollPanel));
+	ATTRIB(XonoticGameSettingsTab, currentPanel, entity, NEW(XonoticTab));
+	ATTRIB(XonoticGameSettingsTab, currentItem, entity);
 	METHOD(XonoticGameSettingsTab, topicChangeNotify, void(entity, entity this));
 	METHOD(XonoticGameSettingsTab, fill, void(entity this));
 	INIT(XonoticGameSettingsTab)