add max-chars attribute to text field
This commit is contained in:
@@ -3,8 +3,8 @@
|
||||
<dialog defbtn='okay'>
|
||||
<!-- OK button -->
|
||||
<field name='who' top='26' left='186' width='64' height='16'/>
|
||||
<field name='key1' top='54' left='165' width='52' height='16'/>
|
||||
<field name='key2' top='54' left='285' width='52' height='16'/>
|
||||
<field name='key1' top='54' left='165' width='52' height='16' max-chars='4'/>
|
||||
<field name='key2' top='54' left='285' width='52' height='16' max-chars='4'/>
|
||||
<text top='6' left='350' width='160' height='48'>The in-game "Buy" button checks for these response keys, in order: purc, sale, heal, iden, trai, ench</text>
|
||||
<text relative='pos-in pos' rel-anchor='prev' top='0' left='0' width='160' height='50'>The "Sell" button checks for sell.</text>
|
||||
<field name='extra1' top='114' left='344' width='64' height='16'/>
|
||||
|
@@ -150,6 +150,7 @@
|
||||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="tab-order" type="xs:integer"/>
|
||||
<xs:attribute name="max-chars" type="xs:integer"/>
|
||||
<xs:attributeGroup ref="rect-size"/>
|
||||
<xs:attributeGroup ref="position"/>
|
||||
</xs:extension>
|
||||
|
@@ -442,16 +442,18 @@ void cTextField::handleInput(cKey key, bool record) {
|
||||
handleInput(deleteKey);
|
||||
contents = getText();
|
||||
}
|
||||
if(aTextInsert* ins = dynamic_cast<aTextInsert*>(current_action.get()))
|
||||
ins->append(key.c);
|
||||
else {
|
||||
if(current_action) history.add(current_action);
|
||||
aTextInsert* new_ins = new aTextInsert(*this, insertionPoint);
|
||||
new_ins->append(key.c);
|
||||
current_action.reset(new_ins);
|
||||
if(maxChars < 0 || contents.size() < maxChars){
|
||||
if(aTextInsert* ins = dynamic_cast<aTextInsert*>(current_action.get()))
|
||||
ins->append(key.c);
|
||||
else {
|
||||
if(current_action) history.add(current_action);
|
||||
aTextInsert* new_ins = new aTextInsert(*this, insertionPoint);
|
||||
new_ins->append(key.c);
|
||||
current_action.reset(new_ins);
|
||||
}
|
||||
contents.insert(contents.begin() + insertionPoint, char(key.c));
|
||||
selectionPoint = ++insertionPoint;
|
||||
}
|
||||
contents.insert(contents.begin() + insertionPoint, char(key.c));
|
||||
selectionPoint = ++insertionPoint;
|
||||
} else switch(key.k) {
|
||||
case key_enter: break; // Shouldn't be receiving this anyway
|
||||
case key_left: case key_word_left:
|
||||
@@ -681,6 +683,9 @@ bool cTextField::parseAttribute(ticpp::Attribute& attr, std::string tagName, std
|
||||
} else if(name == "tab-order"){
|
||||
attr.GetValue(&tabOrder);
|
||||
return true;
|
||||
} else if(name == "max-chars"){
|
||||
attr.GetValue(&maxChars);
|
||||
return true;
|
||||
}
|
||||
return cControl::parseAttribute(attr, tagName, fname);
|
||||
}
|
||||
|
@@ -90,6 +90,10 @@ private:
|
||||
rectangle text_rect;
|
||||
std::vector<snippet_t> snippets;
|
||||
int ip_row, ip_col;
|
||||
/// Setting maxChars AFTER the player has a chance to type in the field would be a bad idea.
|
||||
/// So would calling setText() with a string longer than maxChars.
|
||||
/// Really, it should probably only be set in xml, as the attribute "max-chars".
|
||||
int maxChars = -1;
|
||||
friend class aTextInsert;
|
||||
friend class aTextDelete;
|
||||
};
|
||||
|
Reference in New Issue
Block a user