mirror of https://github.com/axmolengine/axmol.git
fd7f7ba085
* [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 |
||
|---|---|---|
| .. | ||
| CocoStudioGUITest | ||
| UITest.cpp | ||
| UITest.h | ||