qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Size TextInput cursor correctly. 

Use the cursorRectangle property to size and position the TextNode's
cursor rather than recalculating the rectangle in an incompatible way.

Task-number: QTBUG-22386
Change-Id: I8ee02b590796b0304683b9b246aba1e59c1fd6a5
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
This commit is contained in:
Andrew den Exter 2011-12-09 16:30:46 +10:00 committed by Qt by Nokia
parent b156b5d8c3
commit a1a4abe377
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/quick/items/qquicktextinput.cpp
View File

@ -1296,13 +1296,7 @@ QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
if (!d->textLayoutDirty) {
QSGSimpleRectNode *cursorNode = node->cursorNode();
if (cursorNode != 0 && !isReadOnly()) {
QFontMetrics fm = QFontMetrics(d->font);
// the y offset is there to keep the baseline constant in case we have script changes in the text.
QPoint offset(-d->hscroll, fm.ascent() - d->control->ascent());
offset.rx() += d->control->cursorToX();
QRect br(boundingRect().toRect());
cursorNode->setRect(QRectF(offset, QSizeF(d->control->cursorWidth(), br.height())));
cursorNode->setRect(cursorRectangle());
if (!d->cursorVisible
|| (!d->control->cursorBlinkStatus() && d->control->cursorBlinkPeriod() > 0)) {
@ -1336,8 +1330,7 @@ QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
}
if (!isReadOnly() && d->cursorItem == 0) {
offset.rx() += d->control->cursorToX();
node->setCursor(QRectF(offset, QSizeF(d->control->cursorWidth(), br.height())), d->color);
node->setCursor(cursorRectangle(), d->color);
if (!d->cursorVisible
|| (!d->control->cursorBlinkStatus() && d->control->cursorBlinkPeriod() > 0)) {
d->hideCursor();