From 5c4108e2f0bcd8c116882eeb4aa96dc02cd22c06 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 15 Oct 2012 10:54:54 +0300 Subject: [PATCH] Fix QQuickTextInput::moveCursorSelection() by using fixed QTextBoundaryFinder behavior. Update QQuickTextInput autotests. Task-number: QTBUG-11365 Change-Id: I81761c019e2fe80c9795fe54a2a990bfc5d4b709 Reviewed-by: Lars Knoll Reviewed-by: Kai Koehne --- src/quick/items/qquicktextinput.cpp | 9 +-- tests/auto/quick/qquicktextedit/qquicktextedit.pro | 2 - .../auto/quick/qquicktextinput/qquicktextinput.pro | 2 - .../quick/qquicktextinput/tst_qquicktextinput.cpp | 85 +++++++++++----------- 4 files changed, 47 insertions(+), 51 deletions(-) diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index e55ba73..22551c9 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2378,8 +2378,8 @@ void QQuickTextInput::moveCursorSelection(int pos, SelectionMode mode) finder.setPosition(anchor); const QTextBoundaryFinder::BoundaryReasons reasons = finder.boundaryReasons(); - if (anchor < text.length() && (!(reasons & QTextBoundaryFinder::StartWord) - || ((reasons & QTextBoundaryFinder::EndWord) && anchor > cursor))) { + if (anchor < text.length() && (reasons == QTextBoundaryFinder::NotAtBoundary + || (reasons & QTextBoundaryFinder::EndOfItem))) { finder.toPreviousBoundary(); } anchor = finder.position() != -1 ? finder.position() : 0; @@ -2396,11 +2396,10 @@ void QQuickTextInput::moveCursorSelection(int pos, SelectionMode mode) finder.setPosition(anchor); const QTextBoundaryFinder::BoundaryReasons reasons = finder.boundaryReasons(); - if (anchor > 0 && (!(reasons & QTextBoundaryFinder::EndWord) - || ((reasons & QTextBoundaryFinder::StartWord) && anchor < cursor))) { + if (anchor > 0 && (reasons == QTextBoundaryFinder::NotAtBoundary + || (reasons & QTextBoundaryFinder::StartOfItem))) { finder.toNextBoundary(); } - anchor = finder.position() != -1 ? finder.position() : text.length(); finder.setPosition(pos); diff --git a/tests/auto/quick/qquicktextedit/qquicktextedit.pro b/tests/auto/quick/qquicktextedit/qquicktextedit.pro index 5f352eb..b0621bc 100644 --- a/tests/auto/quick/qquicktextedit/qquicktextedit.pro +++ b/tests/auto/quick/qquicktextedit/qquicktextedit.pro @@ -13,6 +13,4 @@ TESTDATA = data/* QT += core-private gui-private v8-private qml-private quick-private network-private testlib -CONFIG+=insignificant_test # until QTextBoundaryFinder gets fixed - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextinput/qquicktextinput.pro b/tests/auto/quick/qquicktextinput/qquicktextinput.pro index 53d2a30..3240d99 100644 --- a/tests/auto/quick/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/quick/qquicktextinput/qquicktextinput.pro @@ -13,6 +13,4 @@ TESTDATA = data/* QT += core-private gui-private v8-private qml-private quick-private testlib -CONFIG+=insignificant_test # until QTextBoundaryFinder gets fixed - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index 3c9e882..249755b 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -911,10 +911,12 @@ void tst_qquicktextinput::moveCursorSelection_data() QTest::newRow("jum<()>ped|words") << standard[0] << 23 << 23 << QQuickTextInput::SelectWords << 23 << 23 << true; - QTest::newRow("Hello<(,)> |words") - << standard[2] << 5 << 6 << QQuickTextInput::SelectWords << 5 << 6 << true; - QTest::newRow("Hello<(, )>world|words,ltr") - << standard[2] << 5 << 7 << QQuickTextInput::SelectWords << 5 << 7 << false; + QTest::newRow(" |words,ltr") + << standard[2] << 5 << 6 << QQuickTextInput::SelectWords << 0 << 6 << false; + QTest::newRow("Hello<(,)> |words,rtl") + << standard[2] << 6 << 5 << QQuickTextInput::SelectWords << 5 << 6 << false; + QTest::newRow("world|words,ltr") + << standard[2] << 5 << 7 << QQuickTextInput::SelectWords << 0 << 7 << false; QTest::newRow("Hello<(, )world>|words,rtl") << standard[2] << 7 << 5 << QQuickTextInput::SelectWords << 5 << 12 << false; QTest::newRow("world|words,ltr") @@ -927,35 +929,35 @@ void tst_qquicktextinput::moveCursorSelection_data() << standard[2] << 5 << 5 << QQuickTextInput::SelectWords << 5 << 5 << true; QTest::newRow("Hello,<()>|words") << standard[2] << 6 << 6 << QQuickTextInput::SelectWords << 6 << 6 << true; - QTest::newRow("Hello<,( )>world|words,ltr") - << standard[2] << 6 << 7 << QQuickTextInput::SelectWords << 5 << 7 << false; + QTest::newRow("Hello,<( )>world|words,ltr") + << standard[2] << 6 << 7 << QQuickTextInput::SelectWords << 6 << 7 << false; QTest::newRow("Hello,<( )world>|words,rtl") << standard[2] << 7 << 6 << QQuickTextInput::SelectWords << 6 << 12 << false; - QTest::newRow("Hello<,( world)>|words,ltr") - << standard[2] << 6 << 12 << QQuickTextInput::SelectWords << 5 << 12 << false; - QTest::newRow("Hello,<( world)>|words,rtl") - << standard[2] << 12 << 6 << QQuickTextInput::SelectWords << 6 << 12 << false; - QTest::newRow("Hello<,( world!)>|words,ltr") - << standard[2] << 6 << 13 << QQuickTextInput::SelectWords << 5 << 13 << false; - QTest::newRow("Hello,<( world!)>|words,rtl") - << standard[2] << 13 << 6 << QQuickTextInput::SelectWords << 6 << 13 << false; - QTest::newRow("Hello<(, world!)>|words") - << standard[2] << 5 << 13 << QQuickTextInput::SelectWords << 5 << 13 << true; - // Fails due to an issue with QTextBoundaryFinder and punctuation at the end of strings. - // QTBUG-11365 - // QTest::newRow("world<(!)>|words") - // << standard[2] << 12 << 13 << QQuickTextInput::SelectWords << 12 << 13 << true; + QTest::newRow("Hello,<( world)>|words") + << standard[2] << 6 << 12 << QQuickTextInput::SelectWords << 6 << 12 << true; + QTest::newRow("Hello,<( world!)>|words") + << standard[2] << 6 << 13 << QQuickTextInput::SelectWords << 6 << 13 << true; + QTest::newRow("|words,ltr") + << standard[2] << 5 << 13 << QQuickTextInput::SelectWords << 0 << 13 << false; + QTest::newRow("Hello<(, world!)>|words,rtl") + << standard[2] << 13 << 5 << QQuickTextInput::SelectWords << 5 << 13 << false; + QTest::newRow("|words,ltr") + << standard[2] << 12 << 13 << QQuickTextInput::SelectWords << 7 << 13 << false; + QTest::newRow("world<(!)>|words,rtl") + << standard[2] << 13 << 12 << QQuickTextInput::SelectWords << 12 << 13 << false; QTest::newRow("world!<()>)|words") << standard[2] << 13 << 13 << QQuickTextInput::SelectWords << 13 << 13 << true; QTest::newRow("world<()>!)|words") << standard[2] << 12 << 12 << QQuickTextInput::SelectWords << 12 << 12 << true; - QTest::newRow("<(,)>olleH |words") - << standard[3] << 7 << 8 << QQuickTextInput::SelectWords << 7 << 8 << true; + QTest::newRow("<(,)>olleH |words,ltr") + << standard[3] << 7 << 8 << QQuickTextInput::SelectWords << 7 << 8 << false; + QTest::newRow("<(,)olleH> |words,rtl") + << standard[3] << 8 << 7 << QQuickTextInput::SelectWords << 7 << 13 << false; QTest::newRow("olleH|words,ltr") << standard[3] << 6 << 8 << QQuickTextInput::SelectWords << 1 << 8 << false; - QTest::newRow("dlrow<( ,)>olleH|words,rtl") - << standard[3] << 8 << 6 << QQuickTextInput::SelectWords << 6 << 8 << false; + QTest::newRow("dlrow<( ,)olleH>|words,rtl") + << standard[3] << 8 << 6 << QQuickTextInput::SelectWords << 6 << 13 << false; QTest::newRow("|words,ltr") << standard[3] << 6 << 10 << QQuickTextInput::SelectWords << 1 << 13 << false; QTest::newRow("dlrow<( ,ol)leH>|words,rtl") @@ -968,20 +970,20 @@ void tst_qquicktextinput::moveCursorSelection_data() << standard[3] << 7 << 7 << QQuickTextInput::SelectWords << 7 << 7 << true; QTest::newRow(",olleH|words,ltr") << standard[3] << 6 << 7 << QQuickTextInput::SelectWords << 1 << 7 << false; - QTest::newRow("dlrow<( ),>olleH|words,rtl") - << standard[3] << 7 << 6 << QQuickTextInput::SelectWords << 6 << 8 << false; - QTest::newRow("<(dlrow )>,olleH|words,ltr") - << standard[3] << 1 << 7 << QQuickTextInput::SelectWords << 1 << 7 << false; - QTest::newRow("<(dlrow ),>olleH|words,rtl") - << standard[3] << 7 << 1 << QQuickTextInput::SelectWords << 1 << 8 << false; - QTest::newRow("<(!dlrow )>,olleH|words,ltr") - << standard[3] << 0 << 7 << QQuickTextInput::SelectWords << 0 << 7 << false; - QTest::newRow("<(!dlrow ),>olleH|words,rtl") - << standard[3] << 7 << 0 << QQuickTextInput::SelectWords << 0 << 8 << false; - QTest::newRow("(!dlrow ,)olleH|words") - << standard[3] << 0 << 8 << QQuickTextInput::SelectWords << 0 << 8 << true; - QTest::newRow("<(!)>dlrow|words") - << standard[3] << 0 << 1 << QQuickTextInput::SelectWords << 0 << 1 << true; + QTest::newRow("dlrow<( )>,olleH|words,rtl") + << standard[3] << 7 << 6 << QQuickTextInput::SelectWords << 6 << 7 << false; + QTest::newRow("<(dlrow )>,olleH|words") + << standard[3] << 1 << 7 << QQuickTextInput::SelectWords << 1 << 7 << true; + QTest::newRow("<(!dlrow )>,olleH|words") + << standard[3] << 0 << 7 << QQuickTextInput::SelectWords << 0 << 7 << true; + QTest::newRow("<(!dlrow ,)>olleH|words,ltr") + << standard[3] << 0 << 8 << QQuickTextInput::SelectWords << 0 << 8 << false; + QTest::newRow("<(!dlrow ,)olleH>|words,rtl") + << standard[3] << 8 << 0 << QQuickTextInput::SelectWords << 0 << 13 << false; + QTest::newRow("<(!)>dlrow|words,ltr") + << standard[3] << 0 << 1 << QQuickTextInput::SelectWords << 0 << 1 << false; + QTest::newRow("<(!)dlrow|words,rtl") + << standard[3] << 1 << 0 << QQuickTextInput::SelectWords << 0 << 6 << false; QTest::newRow("<()>!dlrow|words") << standard[3] << 0 << 0 << QQuickTextInput::SelectWords << 0 << 0 << true; QTest::newRow("!<()>dlrow|words") @@ -990,16 +992,15 @@ void tst_qquicktextinput::moveCursorSelection_data() QTest::newRow(" text |words") << standard[4] << 1 << 4 << QQuickTextInput::SelectWords << 1 << 7 << true; QTest::newRow(" spacey |words") - << standard[4] << 11 << 13 << QQuickTextInput::SelectWords << 10 << 14 << false; // Should be reversible. QTBUG-11365 + << standard[4] << 11 << 13 << QQuickTextInput::SelectWords << 10 << 14 << true; QTest::newRow("<( )>spacey text |words|ltr") << standard[4] << 0 << 1 << QQuickTextInput::SelectWords << 0 << 1 << false; QTest::newRow("<( )spacey> text |words|rtl") << standard[4] << 1 << 0 << QQuickTextInput::SelectWords << 0 << 7 << false; QTest::newRow("spacey |words|ltr") << standard[4] << 14 << 15 << QQuickTextInput::SelectWords << 10 << 15 << false; -// QTBUG-11365 -// QTest::newRow("spacey text<( )>|words|rtl") -// << standard[4] << 15 << 14 << QQuickTextInput::SelectWords << 14 << 15 << false; + QTest::newRow("spacey text<( )>|words|rtl") + << standard[4] << 15 << 14 << QQuickTextInput::SelectWords << 14 << 15 << false; QTest::newRow("<()> spacey text |words") << standard[4] << 0 << 0 << QQuickTextInput::SelectWords << 0 << 0 << false; QTest::newRow(" spacey text <()>|words") -- 2.7.4