From 90461979bcf0bf89027053eec37047ff7b88752f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Mar 2015 15:18:10 +0100 Subject: Avoid using the current frame as the previous in layout When continuing a previous layout, we would in some cases add a wrong margin because we would treat the current frame as preceding itself. Task-number: QTBUG-42269 Change-Id: Idf00fadbed890ce34b073cf670cc9b8e1d4b0d5d Reviewed-by: Lars Knoll --- src/gui/text/qtextdocumentlayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/text/qtextdocumentlayout.cpp') diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 1ddc9141af..74371d77c0 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -2432,7 +2432,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout ++it; } else { QTextFrame::Iterator lastIt; - if (!previousIt.atEnd()) + if (!previousIt.atEnd() && previousIt != it) lastIt = previousIt; previousIt = it; QTextBlock block = it.currentBlock(); -- cgit v1.2.3