summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-03-23 14:48:09 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-03-30 07:12:57 +0000
commit086317d72a6b6964bf26df4ebedcb6d321b2d56b (patch)
treed2860a5e441409d32401f7109a6ed74e38d38479 /src/widgets/widgets/qtextedit.cpp
parentc35795b413c6aedd6b02f03fdcaa5fb4888084d5 (diff)
QTextEdit::inputMethodQuery(): Preserve types when applying offset.
The old code converted QRectF into QRect when applying the offset. Change the offset point to QPointF and change the conversions accordingly. Add an autotest similar to that of QPlainTextEdit. This minimizes rounding errors and prevents conversions since the input method logic mostly uses qreal. Task-number: QTBUG-51923 Change-Id: I0c2f80ccae028d8bbbb97ec603f8782f69959c76 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
-rw-r--r--src/widgets/widgets/qtextedit.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 7439005b92..95f0bc7c59 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -1726,15 +1726,15 @@ QVariant QTextEdit::inputMethodQuery(Qt::InputMethodQuery query, QVariant argume
break;
default:
v = d->control->inputMethodQuery(query, argument);
- const QPoint offset(-d->horizontalOffset(), -d->verticalOffset());
+ const QPointF offset(-d->horizontalOffset(), -d->verticalOffset());
if (v.type() == QVariant::RectF)
- v = v.toRectF().toRect().translated(offset);
+ v = v.toRectF().translated(offset);
else if (v.type() == QVariant::PointF)
- v = v.toPointF().toPoint() + offset;
+ v = v.toPointF() + offset;
else if (v.type() == QVariant::Rect)
- v = v.toRect().translated(offset);
+ v = v.toRect().translated(offset.toPoint());
else if (v.type() == QVariant::Point)
- v = v.toPoint() + offset;
+ v = v.toPoint() + offset.toPoint();
}
return v;