diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 24157cee78..7d32e4e9e9 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -1945,6 +1945,9 @@ void Label::updateDisplayedOpacity(GLubyte parentOpacity) } } +// FIXME: it is not clear what is the difference between setTextColor() and setColor() +// if setTextColor() only changes the text and nothing but the text (no glow, no outline, not underline) +// that's fine but it should be documented void Label::setTextColor(const Color4B &color) { CCASSERT(_currentLabelType == LabelType::TTF || _currentLabelType == LabelType::STRING_TEXTURE, "Only supported system font and ttf!"); diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index 33241adbe4..d35869341d 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -3197,7 +3197,7 @@ std::string LabelIssue15214::title() const std::string LabelIssue15214::subtitle() const { - return "Font and underline should be of the same color"; + return "Font + underline: same color with setColor()"; } //