зеркало из https://github.com/mozilla/pjs.git
bug 752459 - respect clusters when doing word-wrap:break-word. r=smontagu
This commit is contained in:
Родитель
552c27b129
Коммит
a988ccdb54
|
@ -4936,7 +4936,9 @@ gfxTextRun::BreakAndMeasureText(PRUint32 aStart, PRUint32 aMaxLength,
|
||||||
if (!aSuppressInitialBreak || i > aStart) {
|
if (!aSuppressInitialBreak || i > aStart) {
|
||||||
bool lineBreakHere = mCharacterGlyphs[i].CanBreakBefore() == 1;
|
bool lineBreakHere = mCharacterGlyphs[i].CanBreakBefore() == 1;
|
||||||
bool hyphenation = haveHyphenation && hyphenBuffer[i - bufferStart];
|
bool hyphenation = haveHyphenation && hyphenBuffer[i - bufferStart];
|
||||||
bool wordWrapping = aCanWordWrap && *aBreakPriority <= eWordWrapBreak;
|
bool wordWrapping =
|
||||||
|
aCanWordWrap && mCharacterGlyphs[i].IsClusterStart() &&
|
||||||
|
*aBreakPriority <= eWordWrapBreak;
|
||||||
|
|
||||||
if (lineBreakHere || hyphenation || wordWrapping) {
|
if (lineBreakHere || hyphenation || wordWrapping) {
|
||||||
gfxFloat hyphenatedAdvance = advance;
|
gfxFloat hyphenatedAdvance = advance;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче