diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-09 12:46:28 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-19 12:21:53 +0000 |
| commit | 722fd8b86e7c3b5d6e4c3382f2710e4d3bfed3ec (patch) | |
| tree | bcbb8e31e68d2e65caf315368949a4a9eb07ce65 /src/quick/items/qquicktextnodeengine.cpp | |
| parent | 45ad54aa931f5aac21c69b10f72308d22e65e609 (diff) | |
Render inline custom text objects
In QTextDocumentLayout inline objects are skipped if they have a frame
and the frame-style isn't inflow. That inverted should be to only render
it if it doesn't have a frame or is the frame-style is inflow.
Fixes: QTBUG-32525
Fixes: QTBUG-70748
Change-Id: I259281ea45c9ba7295c6b3e116a941314ada22e5
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextnodeengine.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index a53ca2a2a4..9c91ae4896 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -1044,7 +1044,7 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText if (text.contains(QChar::ObjectReplacementCharacter)) { QTextFrame *frame = qobject_cast<QTextFrame *>(textDocument->objectForFormat(charFormat)); - if (frame && frame->frameFormat().position() == QTextFrameFormat::InFlow) { + if (!frame || frame->frameFormat().position() == QTextFrameFormat::InFlow) { int blockRelativePosition = textPos - block.position(); QTextLine line = block.layout()->lineForTextPosition(blockRelativePosition); if (!currentLine().isValid() |