diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-20 17:39:48 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 21:22:46 +0200 |
commit | 43431619d644ebd783d292a12c1904cfd7680824 (patch) | |
tree | 7d79c2b79f6ed450613b29de700ee488d8cd99f4 /src/quick/items/qquicktextinput.cpp | |
parent | 7a1b5b1cfece18d5f4b2d8beb340d3cbe8f54451 (diff) | |
parent | cb6c208c77e2e3c8b6d5957fae73f0326eee4296 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quick/items/qquickflickable_p_p.h
src/quick/items/qquickpathview_p_p.h
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: I77664a095d8a203e07a021c9d5953e02b8b99a1e
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 9b7eb4ea4b..65e066c611 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1042,6 +1042,7 @@ void QQuickTextInput::q_validatorChanged() QRectF QQuickTextInputPrivate::anchorRectangle() const { + Q_Q(const QQuickTextInput); QRectF rect; int a; // Unfortunately we cannot use selectionStart() and selectionEnd() @@ -1062,8 +1063,8 @@ QRectF QQuickTextInputPrivate::anchorRectangle() const a = 0; QTextLine l = m_textLayout.lineForTextPosition(a); if (l.isValid()) { - qreal x = l.cursorToX(a) - hscroll; - qreal y = l.y() - vscroll; + qreal x = l.cursorToX(a) - hscroll + q->leftPadding(); + qreal y = l.y() - vscroll + q->topPadding(); rect.setRect(x, y, 1, l.height()); } } |