whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip 'off-by-one' adjustment in block length during undo operation 

The adjustment of block length with 'off-by-one' affects content
length during undo operation. The issue occurs when we perform undo
operation for a set of group blocks that have same fragment
position. Since their positions are same, group block change
(QTextDocumentPrivate::documentChange) with respect to insertion
doesn't affect document block length and further adjustment to
'off-by-one' without considering this leads to incorrect document
content change information (such as invalid information with regard
to characters removed).

This patch skips adjustment of group block length during undo
operation.

Amends 8fbedf2196

Fixes: QTBUG-113865
Pick-to: 6.7 6.6 6.5 6.2 5.15
Change-Id: I315dcf01ba5b2f4ed6d95e9d6910d82848374aef
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
bb10
Santhosh Kumar 2023-12-03 22:00:37 +01:00 committed by Shawn Rutledge
parent 5b09d9e6d6
commit 8a72508439
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qtextdocument_p.cpp
View File

@ -349,8 +349,10 @@ int QTextDocumentPrivate::insert_block(int pos, uint strPos, int format, int blo
QTextBlockGroup *group = qobject_cast<QTextBlockGroup *>(objectForFormat(blockFormat));
if (group) {
group->blockInserted(QTextBlock(this, b));
docChangeOldLength--;
docChangeLength--;
if (command != QTextUndoCommand::BlockDeleted) {
docChangeOldLength--;
docChangeLength--;
}
}
QTextFrame *frame = qobject_cast<QTextFrame *>(objectForFormat(formats.format(format)));

57
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
View File

@ -181,6 +181,7 @@ private slots:
void insertHtmlWithComments();
void delayedLayout();
void undoContentChangeIndices();
private:
void backgroundImage_checkExpectedHtml(const QTextDocument &doc);
@ -3988,5 +3989,61 @@ void tst_QTextDocument::delayedLayout()
QCOMPARE(layout->lineCount(), 1); // layout happened
}
void tst_QTextDocument::undoContentChangeIndices() // QTBUG-113865
{
QTextDocument doc;
QTestDocumentLayout *layout = new QTestDocumentLayout(&doc);
QString content = QString("<html><body>"
"<ul><li>Undo</li></ul>"
"<ul><li>operation</li></ul>"
"<ul><li>of</li></ul>"
"<ul><li>unnumbered</li></ul>"
"<ul><li>lists</li></ul>"
"<ul><li>shows</li></ul>"
"<ul><li>invalid</li></ul>"
"<ul><li>content</li></ul>"
"<ul><li>indices</li></ul>"
"</body></html>");
doc.setDocumentLayout(layout);
doc.setHtml(content);
// Select the entire document content
QTextCursor cursor(&doc);
cursor.select(QTextCursor::Document);
cursor.removeSelectedText();
// Undo above operation
doc.undo();
// Move the cursor to the end
cursor.movePosition(QTextCursor::End);
cursor.insertHtml(content);
// Select the whole document and remove the content
cursor.select(QTextCursor::Document);
cursor.removeSelectedText();
int documentLength = 0;
int changeRemoved = 0;
int changeAdded = 0;
int changePos = 0;
connect(&doc, &QTextDocument::contentsChange, this, [&](int pos, int removed, int added){
documentLength = doc.characterCount();
changeRemoved = removed;
changeAdded = added;
changePos = pos;
});
// Undo above operation
doc.undo();
const int changeEnd = changeAdded + changeRemoved;
QVERIFY(documentLength > 0);
QCOMPARE(changePos, 0);
QVERIFY(changeRemoved >= 0);
QVERIFY(documentLength >= changeEnd);
}
QTEST_MAIN(tst_QTextDocument)
#include "tst_qtextdocument.moc"