QTextHtmlParser::lookupElement now compares elements case insensitively, so there is no need to manually lower-case the input tag before the lookup. Remove the QVarLengthArray and the per-character toLower loop. Change-Id: Ie0b960b5385c3fd43251795e0f8e4a7eb87e01b8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Replace hand-written if/else chains comparing tag characters with switch statements over QTextHtmlParser::lookupElement(). This reuses the shared HTML element lookup table from QtGui instead of duplicating tag name matching logic. The result is more readable, easier to maintain, and ensures that tag identification stays consistent with the rest of Qt's HTML handling. Change-Id: I49421b99e09157d7e12142a5192831acafffed29 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Replace the Nbsp-padding approach for inline images in StyledText with a single ObjectReplacementCharacter per image. QTextImageFormat ranges are set via setFormats() so that QTextEngine correctly sizes each inline object during itemization and shaping. Image positioning is extracted into positionInlineImages() which iterates over format ranges and uses objectIndex to find the corresponding imgTag. It uses cursorToX at both edges of the inline object to determine the left edge, handling both LTR and RTL text. The elide path now uses QTextEngine::elidedText() for all text formats, which correctly accounts for ObjectReplacementCharacter widths. Image format ranges are carried into the elide layout via elideFormats(), so positionInlineImages() works uniformly for both the main and elide layouts. setLineGeometry() is simplified to only handle line geometry. positionInlineImages() is called separately after it. The styled text parser emits ObjectReplacementCharacter only for images with a valid URL, and resets hasSpace after it so that spaces after an img tag are preserved symmetrically. [ChangeLog][QtQuick][Text] Inline images in StyledText now participate correctly in text eliding, wrapping, and line breaking. Fixes: QTBUG-112717 Fixes: QTBUG-97536 Fixes: QTBUG-57191 Fixes: QTBUG-36163 Fixes: QTBUG-39107 Fixes: QTBUG-43820 Fixes: QTBUG-113829 Fixes: QTBUG-115285 Fixes: QTBUG-133284 Change-Id: Id2e2ce1238d521d7b901404b77af1ca30315e2b5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
In parseImageAttributes(), use QStringView::toInt() directly instead of converting to QString first. QStringView already provides toInt(), so the intermediate toString() allocation is unnecessary. Change-Id: I95e0a32a462c016c6acc732a0b282978afe16690 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Since QVector is just an alias, let's finally do what we could have done for Qt 6.0. Pick-to: 6.11 Change-Id: Ia9dbc8ecf4f099339cf7639acb22c14b24fa680b Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
For Text.StyledText, there was no protection against <img> tags with very large widths or heights. This could cause an application to spend a very long time processing a layout and sometimes crash if the size was too large. We reuse the internal coord limit in QPainter as our maximum size here, similar to what we do in Qt Svg for instance. For Text.RichText, there were no issues in release builds, but in debug builds, you could trigger an overflow assert when rounding the number if it exceeded INT_MAX. For this, we simply cap the width and height at INT_MAX. Fixes: QTBUG-141515 Pick-to: 5.15 6.5 6.8 6.10 Change-Id: I4bcba16158f5f495a0de38963316effc4c46aae1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
QPair is just an alias of std::pair anyway. Task-number: QTBUG-115841 Change-Id: I26fc90adcc775aac9955ad57304af914dc4ed48f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Task-number: QTBUG-132472 Task-number: QTBUG-134547 Pick-to: 6.8 6.9 Change-Id: I916d996e593a270b9e3b0c07d0a9e6338b8883fc Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Non-static, non-forward-declared logging categories are deprecated. Change-Id: Iaeb0183ef7ca05bbd0f4587166096c29825cc175 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Use QScopedPointer for QQuickPixmap member of QQuickStyledTextImgTag instead of holding it as a raw pointer. This way we make it a little safer to use and can clean up the code a bit. Change-Id: I98ebbe7892d4019ad305d8087bd195071fa868a4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>