Move cb_offset and cb_src initialization to the right place

diff --git a/qcsrc/menu/item/inputbox.c b/qcsrc/menu/item/inputbox.c
index 67ac8e995770b9b7f8b38a312bfc82bed85f030f..dcf7f2cc589f557bdeb786fbdab32816c27dc7b5 100644 (file)
--- a/qcsrc/menu/item/inputbox.c
+++ b/qcsrc/menu/item/inputbox.c
@@ -32,10 +32,8 @@ CLASS(InputBox) EXTENDS(Label)
        ATTRIB(InputBox, enableClearButton, float, 1)
        ATTRIB(InputBox, clearButton, entity, NULL)
        ATTRIB(InputBox, cb_size, vector, '0 0 0')
-       ATTRIB(InputBox, cb_offset, float, SKINOFFSET_CLEARBUTTON) // bound to range -1, 0
        ATTRIB(InputBox, cb_pressed, float, 0)
        ATTRIB(InputBox, cb_focused, float, 0)
-       ATTRIB(InputBox, cb_src, string, SKINGFX_CLEARBUTTON)
 ENDCLASS(InputBox)
 void InputBox_Clear_Click(entity btn, entity me);
 #endif

diff --git a/qcsrc/menu/xonotic/inputbox.c b/qcsrc/menu/xonotic/inputbox.c
index 2a9c094b8eb07a74ac6752562b3eecfb87cd200a..9e42f3bf6fc0fa61c56f54f5bd92e2ab80612223 100644 (file)
--- a/qcsrc/menu/xonotic/inputbox.c
+++ b/qcsrc/menu/xonotic/inputbox.c
@@ -16,6 +16,10 @@ CLASS(XonoticInputBox) EXTENDS(InputBox)
 
        ATTRIB(XonoticInputBox, alpha, float, SKINALPHA_TEXT)
 
+       // Clear button attributes
+       ATTRIB(XonoticInputBox, cb_offset, float, SKINOFFSET_CLEARBUTTON) // bound to range -1, 0
+       ATTRIB(XonoticInputBox, cb_src, string, SKINGFX_CLEARBUTTON)
+
        ATTRIB(XonoticInputBox, cvarName, string, string_null)
        METHOD(XonoticInputBox, loadCvars, void(entity))
        METHOD(XonoticInputBox, saveCvars, void(entity))