X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_misc_cvars.c;h=f511ec361cb6fbf4bd44e803fe341a41b2db7d49;hb=8a214d3dd82c92fff17b2e1764afe2d4253dc3b8;hp=be2b64259cf15bf615835df26f44833247873dae;hpb=9df92eba777ae4365b46b0eb61fe315d91ed9388;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
index be2b64259..f511ec361 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
@@ -5,7 +5,7 @@ CLASS(XonoticCvarsDialog) EXTENDS(XonoticDialog)
 	ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings"))
 	ATTRIB(XonoticCvarsDialog, color, vector, SKINCOLOR_DIALOG_CVARS)
 	ATTRIB(XonoticCvarsDialog, intendedWidth, float, 0.8)
-	ATTRIB(XonoticCvarsDialog, rows, float, 25)
+	ATTRIB(XonoticCvarsDialog, rows, float, 24)
 	ATTRIB(XonoticCvarsDialog, columns, float, 6)
 ENDCLASS(XonoticCvarsDialog)
 #endif
@@ -15,22 +15,33 @@ void XonoticCvarsDialog_showNotify(entity me)
 {
 	loadAllCvars(me);
 }
-void XonoticCvarsDialog_fill(entity me)
+void XonoticCvarsDialog_fill(entity me) // in this dialog, use SKINCOLOR_CVARLIST_CONTROLS to color ALL controls
 {
-	entity e, cvarlist, btn;
+
+	entity e, cvarlist;
+
 	cvarlist = makeXonoticCvarList();
+
+	cvarlist.color =
+		cvarlist.colorF =
+		cvarlist.color2 =
+		cvarlist.colorC =
+		SKINCOLOR_CVARLIST_CONTROLS;
+
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Cvar filter:")));
-		me.TD(me, 1, 0.5, btn = makeXonoticButton(_("Clear"), '0 0 0'));
-		me.TD(me, 1, me.columns - 1.5, e = makeXonoticInputBox(0, string_null));
+		me.TD(me, 1, me.columns - 1, e = makeXonoticInputBox(0, string_null));
+			e.color = SKINCOLOR_CVARLIST_CONTROLS;
+			e.colorF = SKINCOLOR_CVARLIST_CONTROLS;
+			e.cb_color = SKINCOLOR_CVARLIST_CONTROLS;
+			e.cb_colorC = SKINCOLOR_CVARLIST_CONTROLS;
+			e.cb_colorF = SKINCOLOR_CVARLIST_CONTROLS;
 			e.onChange = CvarList_Filter_Change;
 			e.onChangeEntity = cvarlist;
-			btn.onClick = InputBox_Clear_Click;
-			btn.onClickEntity = e;
 			cvarlist.controlledTextbox = e; // this COULD also be the Value box, but this leads to accidentally editing stuff
 	me.TR(me);
-		me.TD(me, me.rows - me.currentRow - 7, me.columns, cvarlist);
-	me.gotoRC(me, me.rows - 7, 0);
+		me.TD(me, me.rows - me.currentRow - 9, me.columns, cvarlist);
+	me.gotoRC(me, me.rows - 8, 0);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Setting:")));
 		me.TD(me, 1, me.columns - 1, e = makeXonoticTextLabel(0, string_null));
 			cvarlist.cvarNameBox = e;
@@ -42,23 +53,29 @@ void XonoticCvarsDialog_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Value:")));
 		me.TD(me, 1, me.columns - 2, e = makeXonoticInputBox(0, string_null));
 			cvarlist.cvarValueBox = e;
+			e.color = SKINCOLOR_CVARLIST_CONTROLS;
+			e.colorF = SKINCOLOR_CVARLIST_CONTROLS;
+			e.cb_color = SKINCOLOR_CVARLIST_CONTROLS;
+			e.cb_colorC = SKINCOLOR_CVARLIST_CONTROLS;
+			e.cb_colorF = SKINCOLOR_CVARLIST_CONTROLS;
 			e.onChange = CvarList_Value_Change;
 			e.onChangeEntity = cvarlist;
 			e.onEnter = CvarList_End_Editing;
 			e.onEnterEntity = cvarlist;
-		me.TD(me, 1, 1, e = makeXonoticButton(string_null, SKINCOLOR_CVARLIST_REVERTBUTTON));
+		me.TD(me, 1, 1, e = makeXonoticButton(string_null, SKINCOLOR_CVARLIST_CONTROLS));
 			cvarlist.cvarDefaultBox = e;
 			e.onClick = CvarList_Revert_Click;
 			e.onClickEntity = cvarlist;
 			e.allowCut = 1;
 			e.marginLeft = e.marginRight = 0.5;
+	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Description:")));
 		me.TD(me, 1, me.columns - 1, e = makeXonoticTextLabel(0, string_null));
 			cvarlist.cvarDescriptionBox = e;
 			e.allowWrap = 1;
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
+		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), SKINCOLOR_CVARLIST_CONTROLS));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }