whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTextLine::cursorToX: Always return the nearest valid cursor position 

The documentation already states we're doing this, so stop lying
and implement it properly :)

Change-Id: Ic78980d76f61e8aa64e59ea058a8105d9c507774
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
bb10
Konstantin Ritt 2015-11-23 14:04:57 +04:00
parent 1ab7880d73
commit 0e99f3c853
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/text/qtextlayout.cpp
View File

@ -2624,26 +2624,26 @@ void QTextLine::draw(QPainter *p, const QPointF &pos, const QTextLayout::FormatR
*/
qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
{
if (!eng->layoutData)
eng->itemize();
const QScriptLine &line = eng->lines[index];
bool lastLine = index >= eng->lines.size() - 1;
QFixed x = line.x;
x += eng->alignLine(line) - eng->leadingSpaceWidth(line);
if (!index && !eng->layoutData->items.size()) {
*cursorPos = 0;
if (!eng->layoutData)
eng->itemize();
if (!eng->layoutData->items.size()) {
*cursorPos = line.from;
return x.toReal();
}
x += eng->alignLine(line) - eng->leadingSpaceWidth(line);
int lineEnd = line.from + line.length + line.trailingSpaces;
int pos = qBound(0, *cursorPos, lineEnd);
int pos = qBound(line.from, *cursorPos, lineEnd);
int itm;
const QCharAttributes *attributes = eng->attributes();
if (!attributes) {
*cursorPos = 0;
*cursorPos = line.from;
return x.toReal();
}
while (pos < lineEnd && !attributes[pos].graphemeBoundary)
@ -2655,7 +2655,7 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
else
itm = eng->findItem(pos);
if (itm < 0) {
*cursorPos = 0;
*cursorPos = line.from;
return x.toReal();
}
eng->shapeLine(line);