From 8de79dbcecb2ac3eb9c07d9e401c25733e1dc192 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Sat, 27 May 2017 17:18:27 +0300 Subject: Widgets: Fix ImSurroundingText query for a QLineEdit with mask QLineEdit with a mask does not return empty fields with the ImSurroundingText query. This is a problem for the input context that is not aware of the mask and relies on the fact that the cursor position never exceeds the boundaries of the surrounding text. This change fixes the issue by returning unmasked text with the ImSurroundingText query. [ChangeLog][QtWidgets][QLineEdit] Fixed behavior of the ImSurroundingText query. Previously, it returned a masked text whose length may be less than the cursor position. Now it returns unmasked text, so the text length is always greater than or equal to the cursor position. Task-number: QTBUG-60319 Change-Id: I1c8009164836a1baa2e3a45958bf1ea5fa9be38d Reviewed-by: Mitch Curtis --- tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp') diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index b434e48500..8a17a4a327 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -313,6 +313,8 @@ private slots: void shortcutOverrideOnReadonlyLineEdit(); void QTBUG59957_clearButtonLeftmostAction(); + void QTBUG_60319_setInputMaskCheckImSurroundingText(); + protected slots: void editingFinished(); @@ -4696,5 +4698,16 @@ bool tst_QLineEdit::unselectingWithLeftOrRightChangesCursorPosition() return false; } +void tst_QLineEdit::QTBUG_60319_setInputMaskCheckImSurroundingText() +{ + QLineEdit *testWidget = ensureTestWidget(); + QString mask("+000(000)-000-00-00"); + testWidget->setInputMask(mask); + testWidget->setCursorPosition(mask.length()); + QString surroundingText = testWidget->inputMethodQuery(Qt::ImSurroundingText).toString(); + int cursorPosition = testWidget->inputMethodQuery(Qt::ImCursorPosition).toInt(); + QCOMPARE(surroundingText.length(), cursorPosition); +} + QTEST_MAIN(tst_QLineEdit) #include "tst_qlineedit.moc" -- cgit v1.2.3