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

Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 

Fix edit box setPlaceholderFontName and scale font size issue
This commit is contained in:
zilongshanren 2015-11-24 11:33:52 +08:00
parent dfe4999a06 361daf7f5f
commit 8d1f1a9933
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/ui/UIEditBox/UIEditBox.cpp
View File

@ -268,7 +268,7 @@ void EditBox::setPlaceholderFontName(const char* pFontName)
_placeholderFontName = pFontName; _placeholderFontName = pFontName;
if (_editBoxImpl != nullptr) if (_editBoxImpl != nullptr)
{ {
_editBoxImpl->setPlaceholderFont(pFontName, _fontSize); _editBoxImpl->setPlaceholderFont(pFontName, _placeholderFontSize);
} }
} }

6
cocos/ui/UIEditBox/UIEditBoxImpl-common.cpp
View File

@ -124,7 +124,7 @@ void EditBoxImplCommon::setInactiveText(const char* pText)
void EditBoxImplCommon::setFont(const char* pFontName, int fontSize) void EditBoxImplCommon::setFont(const char* pFontName, int fontSize)
{ {
this->setNativeFont(pFontName, fontSize); this->setNativeFont(pFontName, fontSize * _label->getNodeToWorldAffineTransform().a);
if(strlen(pFontName) > 0) if(strlen(pFontName) > 0)
{ {
@ -145,7 +145,7 @@ void EditBoxImplCommon::setFontColor(const Color4B& color)
void EditBoxImplCommon::setPlaceholderFont(const char* pFontName, int fontSize) void EditBoxImplCommon::setPlaceholderFont(const char* pFontName, int fontSize)
{ {
this->setNativePlaceholderFont(pFontName, fontSize); this->setNativePlaceholderFont(pFontName, fontSize * _labelPlaceHolder->getNodeToWorldAffineTransform().a);
if( strlen(pFontName) > 0) if( strlen(pFontName) > 0)
{ {
@ -249,7 +249,7 @@ void EditBoxImplCommon::setContentSize(const Size& size)
auto director = cocos2d::Director::getInstance(); auto director = cocos2d::Director::getInstance();
auto glview = director->getOpenGLView(); auto glview = director->getOpenGLView();
Size controlSize = Size(size.width * glview->getScaleX(),size.height * glview->getScaleY()); Size controlSize = Size(size.width * glview->getScaleX() * _label->getNodeToWorldAffineTransform().a,size.height * glview->getScaleY() * _label->getNodeToWorldAffineTransform().a);
this->setNativeContentSize(controlSize); this->setNativeContentSize(controlSize);

14
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
View File

@ -100,17 +100,25 @@ bool UIEditBoxTest::init()
addChild(buttonPassword); addChild(buttonPassword);
// bottom // bottom
// Add an intermediate Node to test scaling and content size relative to world
_editEmailParent = Node::create();
_editEmailParent->setScale(0.5);
_editEmailParent->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/4));
addChild(_editEmailParent);
auto bottomButtonSize = Size(editBoxSize.width, editBoxSize.height + 10); auto bottomButtonSize = Size(editBoxSize.width, editBoxSize.height + 10);
_editEmail = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png"); _editEmail = ui::EditBox::create(bottomButtonSize, "extensions/yellow_edit.png");
_editEmail->setPosition(Vec2(visibleOrigin.x+visibleSize.width/2-50, visibleOrigin.y+visibleSize.height/4));
_editEmail->setPlaceHolder("Email:"); _editEmail->setPlaceHolder("Email:");
_editEmail->setInputMode(ui::EditBox::InputMode::EMAIL_ADDRESS); _editEmail->setInputMode(ui::EditBox::InputMode::EMAIL_ADDRESS);
_editEmail->setDelegate(this); _editEmail->setDelegate(this);
addChild(_editEmail); _editEmailParent->addChild(_editEmail);
//It is required to use setFontSize and setContentSize after adding it to the hierarchy, so that native EditBox get the right size
_editEmail->setFontSize(30);
_editEmail->setContentSize(bottomButtonSize);
auto buttonEmail = (ui::Button*)button->clone(); auto buttonEmail = (ui::Button*)button->clone();
buttonEmail->setTitleText("Multiline"); buttonEmail->setTitleText("Multiline");
buttonEmail->setPosition(_editEmail->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0 )); buttonEmail->setPosition(_editEmailParent->getPosition() + Vec2(editBoxSize.width/2 + buttonSize.width/2, 0 ));
buttonEmail->addClickEventListener([=](Ref* ref){ buttonEmail->addClickEventListener([=](Ref* ref){
_editEmail->setInputMode(ui::EditBox::InputMode::ANY); _editEmail->setInputMode(ui::EditBox::InputMode::ANY);
}); });

1
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIEditBoxTest.h
View File

@ -47,6 +47,7 @@ protected:
cocos2d::ui::EditBox* _editName; cocos2d::ui::EditBox* _editName;
cocos2d::ui::EditBox* _editPassword; cocos2d::ui::EditBox* _editPassword;
cocos2d::ui::EditBox* _editEmail; cocos2d::ui::EditBox* _editEmail;
cocos2d::Node* _editEmailParent;
}; };
#endif /* defined(__cocos2d_tests__UIEditBoxTest__) */ #endif /* defined(__cocos2d_tests__UIEditBoxTest__) */