diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-10-15 11:27:09 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-20 11:35:52 +0200 |
| commit | 9ed6ff0b1f6fe526978d4132b2e27aa98112900c (patch) | |
| tree | 56845a67a6186892b6e7ed6813cb0a84763f7a09 /src | |
| parent | 2b0da5b2799e1157d46f095093f370f2eef9c3ae (diff) | |
Fix QDeclarativeTextInput::moveCursorSelection()
by using fixed QTextBoundaryFinder behavior.
Update QDeclarativeTextInput autotests.
Task-number: QTBUG-11365
Task-number: QTBUG-27364
Change-Id: Idda22f6c0974bf29d2ff961ea8d998a68c3d676b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 4d07f55f..8c13faeb 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -1684,8 +1684,8 @@ void QDeclarativeTextInput::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; @@ -1702,8 +1702,8 @@ void QDeclarativeTextInput::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(); |