From: terencehill <piuntn@gmail.com>
Date: Sun, 16 Jan 2011 23:04:44 +0000 (+0100)
Subject: Cvar list dialog: ENTER in the cvar editing inputbox returns the focus to the cvar... 
X-Git-Tag: xonotic-v0.5.0~316^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb97bb85e73168fda905ea25f306623150cb688d;p=xonotic%2Fxonotic-data.pk3dir.git

Cvar list dialog: ENTER in the cvar editing inputbox returns the focus to the cvar list
This way it's possible to control again cvarlist once an item has been clicked
---

diff --git a/qcsrc/menu/xonotic/cvarlist.c b/qcsrc/menu/xonotic/cvarlist.c
index 3eaf2677e..7a19bab79 100644
--- a/qcsrc/menu/xonotic/cvarlist.c
+++ b/qcsrc/menu/xonotic/cvarlist.c
@@ -35,6 +35,7 @@ entity makeXonoticCvarList();
 void CvarList_Filter_Change(entity box, entity me);
 void CvarList_Value_Change(entity box, entity me);
 void CvarList_Revert_Click(entity btn, entity me);
+void CvarList_End_Editing(entity box, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -192,4 +193,9 @@ void CvarList_Revert_Click(entity btn, entity me)
 	me.cvarValueBox.cursorPos = strlen(me.cvarDefault);
 }
 
+void CvarList_End_Editing(entity box, entity me)
+{
+	box.parent.setFocus(box.parent, me);
+}
+
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
index 0d846caf2..eafc3c4fc 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
@@ -49,6 +49,8 @@ void XonoticCvarsDialog_fill(entity me)
 			cvarlist.cvarValueBox = e;
 			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));
 			cvarlist.cvarDefaultBox = e;
 			e.onClick = CvarList_Revert_Click;