Skip to content

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

Merged
zilongshanren merged 1 commit into
cocos2d:v3from
m-yukio:feature/fixed-richtext
Nov 19, 2015
Merged

Support the new line element. Fixed a problem of UIRichText.#14033
zilongshanren merged 1 commit into
cocos2d:v3from
m-yukio:feature/fixed-richtext

Conversation

@m-yukio

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

Copy link
Copy Markdown
Contributor

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

richtext

@pandamicro

Copy link
Copy Markdown
Contributor

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

@pandamicro

Copy link
Copy Markdown
Contributor

Also, @m-yukio please fix the compilation issues

@m-yukio

m-yukio commented Oct 5, 2015

Copy link
Copy Markdown
Contributor Author

[ci rebuild]

@m-yukio

m-yukio commented Oct 5, 2015

Copy link
Copy Markdown
Contributor Author

a issues is fixed.

@liamcindy

Copy link
Copy Markdown
Contributor

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

@pandamicro

Copy link
Copy Markdown
Contributor

@zilongshanren Please confirm

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

Copy link
Copy Markdown
Contributor

@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