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

Fix cocos2d::EditBox padding (#18572)

This commit is contained in:
Vladyslav Kaplun 2017-12-18 05:23:36 +02:00 committed by minggo
parent 45992aa80e
commit 4c0361e184
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,12 +144,12 @@ void EditBoxImplCommon::setInactiveText(const char* pText)
_label->setString(pText);
}
// Clip the text width to fit to the text box
float fMaxWidth = _editBox->getContentSize().width;
float fMaxHeight = _editBox->getContentSize().height;
const auto& editBoxSize = _editBox->getContentSize();
const auto maxSize = applyPadding(cocos2d::Size(editBoxSize.width, editBoxSize.height));
Size labelSize = _label->getContentSize();
if(labelSize.width > fMaxWidth || labelSize.height > fMaxHeight)
if(labelSize.width > maxSize.width || labelSize.height > maxSize.height)
{
_label->setDimensions(fMaxWidth, fMaxHeight);
_label->setDimensions(maxSize.width, maxSize.height);
}
}
@ -201,7 +201,7 @@ void EditBoxImplCommon::setInputMode(EditBox::InputMode inputMode)
{
_editBoxInputMode = inputMode;
this->setNativeInputMode(inputMode);
this->placeInactiveLabels(_editBox->getContentSize());
this->placeInactiveLabels(applyPadding(_editBox->getContentSize()));
}
void EditBoxImplCommon::setMaxLength(int maxLength)
@ -282,9 +282,9 @@ void EditBoxImplCommon::setVisible(bool visible)
void EditBoxImplCommon::setContentSize(const Size& size)
{
_contentSize = size;
CCLOG("[Edit text] content size = (%f, %f)", size.width, size.height);
placeInactiveLabels(size);
_contentSize = applyPadding(size);
CCLOG("[Edit text] content size = (%f, %f)", _contentSize.width, _contentSize.height);
placeInactiveLabels(_contentSize);
}
void EditBoxImplCommon::draw(Renderer* /*renderer*/, const Mat4& /*transform*/, uint32_t flags)
@ -413,6 +413,11 @@ void EditBoxImplCommon::editBoxEditingChanged(const std::string& text)
}
Size ui::EditBoxImplCommon::applyPadding(const Size& sizeToCorrect) const {
constexpr auto paddingLeftRight = CC_EDIT_BOX_PADDING * 2;
return Size(sizeToCorrect.width - paddingLeftRight, sizeToCorrect.height);
}
NS_CC_END

2
cocos/ui/UIEditBox/UIEditBoxImpl-common.h
View File

@ -136,6 +136,8 @@ protected:
void placeInactiveLabels(const Size& size);
virtual void doAnimationWhenKeyboardMove(float duration, float distance)override {};
Size applyPadding(const Size& size) const;
Label* _label;
Label* _labelPlaceHolder;
EditBox::InputMode _editBoxInputMode;