Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField 

Conflicts:
	cocos/ui/UITextField.h
This commit is contained in:
andyque 2014-06-09 14:46:04 +08:00
parent 6a4322eeac d7f808934d
commit d46025af64
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/ui/UITextField.cpp
View File

@ -564,6 +564,11 @@ const std::string& TextField::getStringValue()const
{
return _textFieldRenderer->getString();
}
int TextField::getStringLength() const {
return _textFieldRenderer->getStringLength();
}
bool TextField::onTouchBegan(Touch *touch, Event *unusedEvent)
{

3
cocos/ui/UITextField.h
View File

@ -150,8 +150,9 @@ public:
void setMaxLengthEnabled(bool enable);
bool isMaxLengthEnabled()const;
void setMaxLength(int length);
int getMaxLength()const;
int getStringLength() const;
void setPasswordEnabled(bool enable);
bool isPasswordEnabled()const;
void setPasswordStyleText(const char* styleText);