axmol/cocos/2d
rh101 fd7f7ba085 Fix for Label and UIRichEdit text trailing space trimming (#18876)
* [UIRichText.cpp] Allow user to select if they want to trim trailing spaces for a RichElementText. Also fixed crash if estimatedIdx is less than 0 in certain conditions.
[UIRichText.h] New flag added for enabling trailing space trimming.
[CCLabelTextFormatter.cpp] Only trim trailing whitespace if lines are being split. This will trim all whitespace up to the next non-whitespace token in a line.

* Fix for oversized sprites that need to be offset by X and Y to be aligned correctly in the UIRichText

* Revert "Fix for oversized sprites that need to be offset by X and Y to be aligned correctly in the UIRichText"

This reverts commit fc5492e878a982ff748488bf1de4ffa88a3d4755.

* [UIRichText] Reverted changes made for trimming since they are no longer required. The changes made to CCLabelTextFormatter.cpp fixed all the current issues.

* Added test cases from #18869

* Removed the forced trailing space clipping since it is not required here, and causing side-effects.

* Removed comment that no longer applies to that section of code
2018-06-08 17:06:29 +08:00
..
libcocos2d_win10 Windows 10 update compiler to Visual Studio 10 PlatformToolset v141 (#18511) 2017-11-27 17:10:52 +08:00
win10_props Win10 remove disabled warnings (#18527) 2017-12-01 08:57:49 +08:00
CCAction.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAction.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionCamera.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionCamera.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionCatmullRom.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionCatmullRom.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionEase.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionEase.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionGrid.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionGrid.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionGrid3D.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionGrid3D.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionInstant.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionInstant.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionInterval.cpp fix typos and grammar in comments (#18853) 2018-05-30 20:41:59 +08:00
CCActionInterval.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionManager.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionManager.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionPageTurn3D.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionPageTurn3D.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionProgressTimer.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionProgressTimer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTiledGrid.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTiledGrid.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTween.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCActionTween.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAnimation.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAnimation.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAnimationCache.cpp Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
CCAnimationCache.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAtlasNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAtlasNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCAutoPolygon.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCAutoPolygon.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCCamera.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCCamera.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCCameraBackgroundBrush.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCCameraBackgroundBrush.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCClippingNode.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCClippingNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCClippingRectangleNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCClippingRectangleNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponent.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponent.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponentContainer.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCComponentContainer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCDrawNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCDrawNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCDrawingPrimitives.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCDrawingPrimitives.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFastTMXLayer.cpp Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
CCFastTMXLayer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFastTMXTiledMap.cpp Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
CCFastTMXTiledMap.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFont.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFont.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontAtlas.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontAtlas.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontAtlasCache.cpp Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
CCFontAtlasCache.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontCharMap.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontCharMap.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontFNT.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontFNT.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCFontFreeType.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCFontFreeType.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCGLBufferedNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCGLBufferedNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCGrabber.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCGrabber.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCGrid.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCGrid.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabel.cpp Fix no-break space size (#18661) 2018-03-13 09:40:24 +08:00
CCLabel.h Fix no-break space size (#18661) 2018-03-13 09:40:24 +08:00
CCLabelAtlas.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabelAtlas.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabelBMFont.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabelBMFont.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabelTTF.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabelTTF.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLabelTextFormatter.cpp Fix for Label and UIRichEdit text trailing space trimming (#18876) 2018-06-08 17:06:29 +08:00
CCLabelTextFormatter.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLayer.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCLayer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLight.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCLight.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCMenu.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCMenu.h Fix misleading comment text in CCMenu.h (#18855) 2018-05-30 20:39:23 +08:00
CCMenuItem.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCMenuItem.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCMotionStreak.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCMotionStreak.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCNode.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCNode.h fix typos and grammar in comments (#18853) 2018-05-30 20:41:59 +08:00
CCNodeGrid.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCNodeGrid.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParallaxNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParallaxNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleBatchNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleBatchNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleExamples.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleExamples.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleSystem.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleSystem.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleSystemQuad.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCParticleSystemQuad.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCProgressTimer.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCProgressTimer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCProtectedNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCProtectedNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCRenderTexture.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCRenderTexture.h Revert "fix issue that render texture will have wrong effect if using with global z order (#18629)" (#18777) 2018-04-19 09:37:05 +08:00
CCScene.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCScene.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSprite.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCSprite.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteBatchNode.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteBatchNode.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteFrame.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteFrame.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCSpriteFrameCache.cpp Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
CCSpriteFrameCache.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXLayer.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXLayer.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXObjectGroup.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXObjectGroup.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXTiledMap.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXTiledMap.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTMXXMLParser.cpp fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
CCTMXXMLParser.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTextFieldTTF.cpp Fix no-break space size (#18661) 2018-03-13 09:40:24 +08:00
CCTextFieldTTF.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTileMapAtlas.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTileMapAtlas.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransition.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransition.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransitionPageTurn.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransitionPageTurn.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransitionProgress.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTransitionProgress.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTweenFunction.cpp update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CCTweenFunction.h update Copyright. might need manual fix later (#18659) 2018-01-29 16:25:32 +08:00
CMakeLists.txt beauty cmake format, reduce duplicate defines (#18799) 2018-05-02 15:33:01 +08:00
cocos2d.def - added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file) 2014-08-15 13:20:37 +03:00
cocos2d_headers.props Refactor WebSocket to support SSL (wss) (#17172) 2017-01-19 13:55:14 +08:00
cocos2dx.props remove vs2013 libs (#18439) 2017-11-03 10:53:14 +08:00
libcocos2d.vcxproj Speed up windows build (#18662) 2018-01-29 16:36:38 +08:00
libcocos2d.vcxproj.filters Speed up windows build (#18662) 2018-01-29 16:36:38 +08:00