f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
6c17ef4baf
fix horizontal clamp and shrink issue
2015-12-07 18:13:03 +08:00
48523572b7
label JS fixes
2015-12-02 17:23:23 -08:00
ed55d41858
fix label clamp when scaled with bmfont
2015-12-02 13:48:20 +08:00
5221f8a6fc
improve the code by code review suggestions.
2015-11-26 12:03:18 +08:00
7ee82f20fc
fix getLetter crash issue.
...
1. make vertical clamp works in non-wrap mode.
2. make the lineHeight and letterSprite scale work correct.
2015-11-20 16:39:48 +08:00
8c25749366
minor improvement
2015-11-20 10:54:05 +08:00
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
ccdb2a75f9
Add Label Overflow and wrap option.
...
Squashed commit of the following:
commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 19 10:30:54 2015 +0800
add char map font test
commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 15:00:17 2015 +0800
system font overflow is not supported
commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 11:04:15 2015 +0800
add system font test
commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 17 10:29:35 2015 +0800
Finish resize height mode
commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 16 11:01:27 2015 +0800
fix wrap issue
commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date: Sat Nov 14 08:28:57 2015 +0800
horizontal shrink still has a issue
commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 11:42:34 2015 +0800
finish shrink without wrap
commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 10:09:46 2015 +0800
update shrink
commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 12 17:55:15 2015 +0800
refactor shrink logic
commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 18:25:34 2015 +0800
add resize overflow type
commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 11:49:51 2015 +0800
no wrap, shrink is working.
commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 10 16:16:27 2015 +0800
add overflow type to label.
1. optimize the testcase
commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:22:34 2015 +0800
finish bmfont wrap by char
commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:04:51 2015 +0800
finish bmfont wrap by word
commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 11:29:21 2015 +0800
add BMFont size support
commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 09:58:01 2015 +0800
add font size support for BMFONT
commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 16:36:27 2015 +0800
add toggle wrap option.
1. make hirozontal clamp working
commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 15:12:59 2015 +0800
tweak label layout
commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 5 11:11:02 2015 +0800
finish the test skeleton
commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 16:38:54 2015 +0800
add setFontSize api to label.
1. add new chinese-english bmfont
2. beautify base test
commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 11:27:18 2015 +0800
add label layout test skeleton
2015-11-19 16:06:13 +08:00
82881bf92f
Merge pull request #14109 from loadrunner/label3
...
Added line spacing/leading feature to Label
2015-10-19 10:55:53 +08:00
5e43cfa129
Merge pull request #14107 from loadrunner/label1
...
Removed scale factor for label shadow
2015-10-13 11:54:14 +08:00
471c23930c
added line spacing/leading
2015-10-10 19:15:45 +03:00
9f768bc1ab
Add missing override keyword
2015-10-02 18:18:23 +09:00
8944f9e1cd
removed scale factor for label shadow
2015-09-28 16:27:20 +03:00
827f05c5e1
Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.
2015-08-19 10:22:48 +08:00
6bf15885b8
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 15:42:05 +08:00
c06994de34
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
2015-08-13 10:29:58 +08:00
eeb4a38715
Label:Fixed letter can be flipped.
2015-08-11 10:06:14 +08:00
2983aed0a9
Label:Fixed crash cause by access an invalid address
2015-08-10 16:50:59 +08:00
b9edd6fc29
Fixed transform
2015-08-05 00:21:06 +08:00
2363622a67
Label:support auto batch with bitmap font or char map.
2015-08-04 21:49:14 +08:00
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
964e7103b5
Improve coding style
2015-07-30 11:33:18 +08:00
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
37a174ee4a
Label:refine the implementation about text layout and support debug draw
2015-07-24 18:38:45 +08:00
63326c2826
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 11:10:17 +08:00
731de26795
Label:Fixed system font may be invisible when there are multiple cameras.
2015-07-17 17:45:11 +08:00
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
b701fd9e73
Fixed compile error
2015-07-14 13:47:35 +08:00
964713355b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail
2015-07-14 13:43:43 +08:00
d4f62a8063
Label:improving the code readability.
2015-07-14 11:30:56 +08:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
81bc0b09da
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-10 14:39:21 +08:00
6a33702c80
Refine Label::onDraw
2015-07-08 17:59:24 +08:00
8cf27b9174
Update comments.
2015-07-08 15:30:34 +08:00
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
158d96046e
Label:Support add child nodes.
2015-07-07 14:20:23 +08:00
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08:00
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
fbe1bd8253
Label should be invisible when the line height is set to zero.
2015-06-23 09:42:48 +08:00
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
cbd428f6ac
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 13:57:23 +08:00
5aa31ea83a
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-11 17:16:44 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
d09bd21da4
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 11:20:22 +08:00
mogemimi