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

Support the new line element. Fixed a problem of UIRichText. #14033

Merged
merged 1 commit into from
Nov 19, 2015

Conversation

m-yukio
Copy link
Contributor

@m-yukio m-yukio commented Sep 28, 2015

Support the new line element of UIRichText.
Fixed a problem that protrude from the drawing area.

richtext

@pandamicro
Copy link
Contributor

@liamcindy Please review this PR, @zilongshanren please help review it

@pandamicro
Copy link
Contributor

Also, @m-yukio please fix the compilation issues

@m-yukio
Copy link
Contributor Author

m-yukio commented Oct 5, 2015

[ci rebuild]

@m-yukio
Copy link
Contributor Author

m-yukio commented Oct 5, 2015

a issues is fixed.

@liamcindy
Copy link
Contributor

Based on current implementation, it's ok to be merged.

@pandamicro
Copy link
Contributor

@zilongshanren Please confirm

@zilongshanren zilongshanren added this to the v3.10 milestone Nov 19, 2015
@zilongshanren
Copy link
Member

@m-yukio
👍 Thanks for your contribution.

zilongshanren added a commit that referenced this pull request Nov 19, 2015
Support the new line element. Fixed a problem of UIRichText.
@zilongshanren zilongshanren merged commit 7ea90c2 into cocos2d:v3 Nov 19, 2015
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.

4 participants