X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcharmap.qc;h=7a10648c91001b8dd186b2b2de89f85f10e013a4;hb=826222f84e886d85179a032b07edc71d99982040;hp=747d1f03b4568a4a820bdc35cedb170b67570a19;hpb=c6d440124df99b8b1f48fe7666332273535eb413;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/charmap.qc b/qcsrc/menu/xonotic/charmap.qc index 747d1f03b..7a10648c9 100644 --- a/qcsrc/menu/xonotic/charmap.qc +++ b/qcsrc/menu/xonotic/charmap.qc @@ -1,21 +1,22 @@ +#include "charmap.qh" #ifndef CHARMAP_H #define CHARMAP_H #include "picker.qc" CLASS(XonoticCharmap, XonoticPicker) - METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity)) - METHOD(XonoticCharmap, focusLeave, void(entity)) - METHOD(XonoticCharmap, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticCharmap, keyDown, float(entity, float, float, float)) + METHOD(XonoticCharmap, configureXonoticCharmap, void(entity, entity)); + METHOD(XonoticCharmap, focusLeave, void(entity)); + METHOD(XonoticCharmap, resizeNotify, void(entity, vector, vector, vector, vector)); + METHOD(XonoticCharmap, keyDown, float(entity, float, float, float)); ATTRIB(XonoticCharmap, inputBox, entity, NULL) ATTRIB(XonoticCharmap, realFontSize, vector, '0 0 0') ATTRIB(XonoticCharmap, rows, float, 10) ATTRIB(XonoticCharmap, columns, float, 14) - METHOD(XonoticCharmap, cellSelect, void(entity, vector)) - METHOD(XonoticCharmap, cellIsValid, bool(entity, vector)) - METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector)) - METHOD(XonoticCharmap, charOffset, vector) + METHOD(XonoticCharmap, cellSelect, void(entity, vector)); + METHOD(XonoticCharmap, cellIsValid, bool(entity, vector)); + METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector)); + ATTRIB(XonoticCharmap, charOffset, vector, '0 0 0') ENDCLASS(XonoticCharmap) entity makeXonoticCharmap(entity controlledInputBox); #endif @@ -98,7 +99,11 @@ void XonoticCharmap_cellSelect(entity me, vector cell) { string character = charmap_cellToChar(me, cell); if(character != "") + { me.inputBox.enterText(me.inputBox, character); + if(me.inputBox.applyButton) + me.inputBox.applyButton.disabled = false; + } } bool XonoticCharmap_cellIsValid(entity me, vector cell)