diff options
| author | Dan Cape <dcape@qnx.com> | 2015-08-13 14:59:52 -0400 |
|---|---|---|
| committer | Dan Cape <dcape@qnx.com> | 2015-09-21 13:53:49 +0000 |
| commit | 0f29340a10b9638666ded939b4f6bf3d891f1320 (patch) | |
| tree | e96210a55e8847dc9022f263d5c8da67831f140a /src/quick/items/qquicktextcontrol.cpp | |
| parent | 8614d4d8362e2fbc56f6b027d310a0d8f11a212f (diff) | |
TextEdit: selectedTextChanged not emitted when calling select 2nd time
qquicktextcontrol was only checking if the text was previous selected
or not and if the current state matched the previous state it would not
dispatch a selectedTextChanged event. This is wrong if you
programmatically select text a second time with a different start or
end of selection. You must notify that the selected text changed since
visually you can see the highlight changed locations.
When correcting this and creating a test case, it was seen that other
tests had QEXPECT_FAIL set for this specific case. Upon further
inspection, I could remove those calls and adjust the expected data
that was set before the test (changing false to true).
testing of tst_qquicktext:
Totals: 182 passed, 0 failed, 0 skipped, 0 blacklisted
testing of tst_qquicktextedit:
Totals: 354 passed, 0 failed, 3 skipped, 0 blacklisted
Task-number: QTBUG-38704
Change-Id: Ib5244dc264ab76951bb722a31dcb64717282725a
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquicktextcontrol.cpp')
| -rw-r--r-- | src/quick/items/qquicktextcontrol.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 7bc5fab677..04e43c017e 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -106,7 +106,9 @@ QQuickTextControlPrivate::QQuickTextControlPrivate() hadSelectionOnMousePress(false), wordSelectionEnabled(false), hasImState(false), - cursorRectangleChanged(false) + cursorRectangleChanged(false), + lastSelectionStart(-1), + lastSelectionEnd(-1) {} bool QQuickTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) @@ -403,11 +405,19 @@ void QQuickTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged / } bool current = cursor.hasSelection(); - if (current == lastSelectionState) + int selectionStart = cursor.selectionStart(); + int selectionEnd = cursor.selectionEnd(); + if (current == lastSelectionState && (!current || (selectionStart == lastSelectionStart && selectionEnd == lastSelectionEnd))) return; - lastSelectionState = current; - emit q->copyAvailable(current); + if (lastSelectionState != current) { + lastSelectionState = current; + emit q->copyAvailable(current); + } + + lastSelectionStart = selectionStart; + lastSelectionEnd = selectionEnd; + if (!forceEmitSelectionChanged) { #ifndef QT_NO_IM if (hasFocus) |