summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlinecontrol_p.h
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-01-21 14:54:18 (GMT)
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2010-01-27 15:30:18 (GMT)
commit9fa39653a42e1e29f83ce272de746bf1441c3800 (patch)
tree012a13106a3b5ccd749269cac188395499020671 /src/gui/widgets/qlinecontrol_p.h
parente001ce29fa3aece2c8eb312be68a33560184c9be (diff)
downloadQt-9fa39653a42e1e29f83ce272de746bf1441c3800.zip
Qt-9fa39653a42e1e29f83ce272de746bf1441c3800.tar.gz
Qt-9fa39653a42e1e29f83ce272de746bf1441c3800.tar.bz2
Make sure cursor is painted at the correct position when we are using IM.
When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
Diffstat (limited to 'src/gui/widgets/qlinecontrol_p.h')
-rw-r--r--src/gui/widgets/qlinecontrol_p.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h
index 301ff72..d6f2705 100644
--- a/src/gui/widgets/qlinecontrol_p.h
+++ b/src/gui/widgets/qlinecontrol_p.h
@@ -549,7 +549,10 @@ inline qreal QLineControl::cursorToX(int cursor) const
inline qreal QLineControl::cursorToX() const
{
- return cursorToX(m_cursor);
+ int cursor = m_cursor;
+ if (m_preeditCursor != -1)
+ cursor += m_preeditCursor;
+ return cursorToX(cursor);
}
inline bool QLineControl::isReadOnly() const