Cvar list dialog: ENTER in the cvar editing inputbox returns the focus to the cvar...

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 3eaf2677e9a4316231080e552e34ad0c7bf7365b..7a19bab7973e7674de02cb2253adfdab4d335f72 100644 (file)
--- 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 0d846caf2ae5f60643f4b8b376bd7a0c89e86278..eafc3c4fcb6ab53425ba9cb96ffc268360cf528b 100644 (file)
--- 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;