X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_misc_cvars.c;h=5db6d35c62c3d6522a9bd1c222947d4dcc16e37b;hp=7ebca4162ce78174a5c9e6a93ffcbaeb8bb09b94;hb=7cf65fc959abac34d7791793d8d10e091416df2f;hpb=71a5c6a7cf9442fc504038825a5cb94ff4355150

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
index 7ebca4162..5db6d35c6 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
@@ -17,26 +17,27 @@ void XonoticCvarsDialog_showNotify(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"), SKINCOLOR_CVARLIST_CONTROLS));
-		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);
@@ -54,6 +55,9 @@ void XonoticCvarsDialog_fill(entity me) // in this dialog, use SKINCOLOR_CVARLIS
 			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;