Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Label updateColor() and underline color work as expected #16486

Merged
merged 1 commit into from Sep 1, 2016

Conversation

ricardoquesada
Copy link
Contributor

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

fixes Github issue cocos2d#15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue cocos2d#16471
@ricardoquesada ricardoquesada added this to the 3.14 milestone Sep 1, 2016
@ricardoquesada ricardoquesada merged commit e57c30c into cocos2d:v3 Sep 1, 2016
@ricardoquesada ricardoquesada deleted the issue_16471 branch September 1, 2016 03:20
minggo pushed a commit to minggo/cocos2d-x that referenced this pull request Sep 5, 2016
…d#16486)

fixes Github issue cocos2d#15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue cocos2d#16471
minggo added a commit that referenced this pull request Sep 7, 2016
* fix: Label updateColor() and underline color work as expected (#16486)

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* fix conflict

* Issue 16471 (#16489)

* fix: Label updateColor() and underline color work as expected

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* docs: added more internal doc for issue_16471
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant