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 node size with outLine component #5145

Merged
merged 1 commit into from Aug 15, 2019

Conversation

@umbrellaPP
Copy link
Contributor

commented Aug 12, 2019

Re: cocos-creator/2d-tasks#1665

changeLog:

  • 修复带 outline 组件时,label 节点的尺寸更新不正确的 bug

RESIZE_HEIGHT 模式需要运行时自动加上 outline 高度
NONE 模式需要自动加上 outline 宽度和高度

其他的 SHRINK 和 CLAMP 模式,节点宽高都应该忠于用户自己的设置

@jareguo jareguo requested review from caryliu1999 and knoxHuang Aug 14, 2019
@jareguo

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

只有 char 模式才会这样

@jareguo jareguo merged commit 88fdd19 into cocos-creator:v2.1.3 Aug 15, 2019
1 check passed
1 check passed
ci/circleci: test Your tests passed on CircleCI!
Details
jareguo added a commit that referenced this pull request Aug 16, 2019
* commit '666cabc45ddae4b40f099aa2c83e01367425940f':
  rm rotation to eulerAngle for _upgrade_1x_to_2x code (#5167)
  fix label node size with outLine component (#5145)

# Conflicts:
#	cocos2d/core/renderer/utils/label/letter-font.js
caryliu1999 added a commit to caryliu1999/engine that referenced this pull request Aug 22, 2019
caryliu1999 added a commit to caryliu1999/engine that referenced this pull request Aug 28, 2019
jareguo added a commit that referenced this pull request Aug 28, 2019
* fix label node size with outLine component (merge #5145)

* fix error
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.