AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTBF: fix the mandatory line breaks not being set in some cases

Browse Source 
e.g. for the text "Aaa bbb ccc.\r\nDdd eee fff." the \r\n wasn't treated
as a hard line break or as a line break opportunity, ever.
Quite ancient bug...

Change-Id: I8d8497c55a3a4d51c27de99ccfe1e31f3bf4de77
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Konstantin Ritt 2012-05-29 05:38:28 +03:00 committed by Qt by Nokia
parent 32c39330ef
commit a9b30841b9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/tools/qunicodetools.cpp
View File

@ -188,10 +188,11 @@ static void calcGraphemeAndLineBreaks(const ushort *string, quint32 len, HB_Char
attributes[i].whiteSpace = true; attributes[i].whiteSpace = true;
HB_LineBreakType lineBreakType = HB_NoBreak; HB_LineBreakType lineBreakType = HB_NoBreak;
if (cls >= QUnicodeTables::LineBreak_LF) {
if (cls >= QUnicodeTables::LineBreak_CR) {
if (cls > QUnicodeTables::LineBreak_CR || ncls != QUnicodeTables::LineBreak_LF)
lineBreakType = HB_ForcedBreak; lineBreakType = HB_ForcedBreak;
} else if (cls == QUnicodeTables::LineBreak_CR) { goto next;
lineBreakType = (ncls == QUnicodeTables::LineBreak_LF) ? HB_NoBreak : HB_ForcedBreak;
} }
if (ncls == QUnicodeTables::LineBreak_SP) if (ncls == QUnicodeTables::LineBreak_SP)