diff --git a/examples/widgets/richtext/textedit/example.html b/examples/widgets/richtext/textedit/example.html index 99090a697f..ca3dce23cc 100644 --- a/examples/widgets/richtext/textedit/example.html +++ b/examples/widgets/richtext/textedit/example.html @@ -1,6 +1,8 @@ -QTextEdit Example +hr { height: 1px; border-width: 0; } +

QTextEdit

The QTextEdit widget is an advanced editor that supports formatted rich text. It can be used to display HTML and other rich document formats. Internally, QTextEdit uses the QTextDocument class to describe both the high-level structure of each document and the low-level formatting of paragraphs.

If you are viewing this document in the textedit example, you can edit this document to explore Qt's rich text editing features. We have included some comments in each of the following sections to encourage you to experiment.

@@ -27,6 +29,9 @@ p, li { white-space: pre-wrap; }

Images

Inline images are treated like ordinary ranges of characters in the text editor, so they flow with the surrounding text. Images can also be selected in the same way as text, making it easy to cut, copy, and paste them.

Try to select this image by clicking and dragging over it with the mouse, or use the text cursor to select it by holding down Shift and using the arrow keys. You can then cut or copy it, and paste it into different parts of this document.

+

Horizontal Rule

+

Here is an example:

+

Tables

QTextEdit can arrange and format tables, supporting features such as row and column spans, text formatting within cells, and size constraints for columns.

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index d3bec57bd4..68cdbc092e 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2359,6 +2359,7 @@ QString QTextHtmlExporter::toHtml(ExportMode mode) html += QString::fromLatin1("") + title + QString::fromLatin1(""); html += QLatin1String(""); html += QLatin1String("(blockFormat.property(QTextFormat::BackgroundBrush)).color()); + html += QLatin1Char(';'); + html += QLatin1Char('\"'); + } html += QLatin1String("/>"); return; diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index abc062bc91..77361d4608 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -2044,7 +2044,9 @@ void QTextDocumentLayoutPrivate::drawBlock(const QPointF &offset, QPainter *pain rect.setRight((fd->size.width - fd->rightMargin).toReal()); } - fillBackground(painter, rect, bg, r.topLeft()); + // in the case of
, the background-color CSS style fills only the rule's thickness instead of the whole line + if (!blockFormat.hasProperty(QTextFormat::BlockTrailingHorizontalRulerWidth)) + fillBackground(painter, rect, bg, r.topLeft()); } QList selections; @@ -2104,7 +2106,10 @@ void QTextDocumentLayoutPrivate::drawBlock(const QPointF &offset, QPainter *pain if (blockFormat.hasProperty(QTextFormat::BlockTrailingHorizontalRulerWidth)) { const qreal width = blockFormat.lengthProperty(QTextFormat::BlockTrailingHorizontalRulerWidth).value(r.width()); - painter->setPen(context.palette.color(QPalette::Dark)); + const auto color = blockFormat.hasProperty(QTextFormat::BackgroundBrush) + ? qvariant_cast(blockFormat.property(QTextFormat::BackgroundBrush)).color() + : context.palette.color(QPalette::Dark); + painter->setPen(color); qreal y = r.bottom(); if (bl.length() == 1) y = r.top() + r.height() / 2; diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index 6a9f7d3a96..ae2550b69e 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1453,6 +1453,8 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList &d applyBackgroundImage(bgImage, resourceProvider); } else if (bgBrush.style() != Qt::NoBrush) { charFormat.setBackground(bgBrush); + if (id == Html_hr) + blockFormat.setProperty(QTextFormat::BackgroundBrush, bgBrush); } } } diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 74c8bfd260..c028ae1b9c 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -289,6 +289,7 @@ void tst_QTextDocument::init() "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "" "\n"); htmlHead = htmlHead.arg(defaultFont.family()) @@ -1501,7 +1502,19 @@ void tst_QTextDocument::toHtml_data() QTest::newRow("horizontal-ruler-with-width") << QTextDocumentFragment::fromHtml("
") << QString("EMPTYBLOCK") + - QString("
"); + QString("
"); + } + { + QTest::newRow("horizontal-ruler-with-color") << QTextDocumentFragment::fromHtml("
") + << + QString("EMPTYBLOCK") + + QString("
"); + } + { + QTest::newRow("horizontal-ruler-with-width-and-color") << QTextDocumentFragment::fromHtml("
") + << + QString("EMPTYBLOCK") + + QString("
"); } { CREATE_DOC_AND_CURSOR(); @@ -1904,20 +1917,12 @@ void tst_QTextDocument::toHtmlBodyBgColor() fmt.setBackground(QColor("#0000ff")); doc.rootFrame()->setFrameFormat(fmt); - QString expectedHtml("\n" - "" - "\n" - "

Blah

" - ""); + QString expectedHtml = htmlHead; + expectedHtml.insert(htmlHead.length() - 2, " bgcolor=\"#0000ff\""); + expectedHtml += "

Blah

" + + htmlTail; - expectedHtml = expectedHtml.arg(defaultFont.family()) - .arg(cssFontSizeString(defaultFont)) - .arg(defaultFont.weight()) - .arg((defaultFont.italic() ? "italic" : "normal")); + writeActualAndExpected(QTest::currentDataTag(), doc.toHtml(), expectedHtml); QCOMPARE(doc.toHtml(), expectedHtml); } @@ -1932,20 +1937,12 @@ void tst_QTextDocument::toHtmlBodyBgColorRgba() fmt.setBackground(QColor(255, 0, 0, 51)); doc.rootFrame()->setFrameFormat(fmt); - QString expectedHtml("\n" - "" - "\n" - "

Blah

" - ""); + QString expectedHtml = htmlHead; + expectedHtml.insert(htmlHead.length() - 2, " bgcolor=\"rgba(255,0,0,0.2)\""); + expectedHtml += "

Blah

" + + htmlTail; - expectedHtml = expectedHtml.arg(defaultFont.family()) - .arg(cssFontSizeString(defaultFont)) - .arg(defaultFont.weight()) - .arg((defaultFont.italic() ? "italic" : "normal")); + writeActualAndExpected(QTest::currentDataTag(), doc.toHtml(), expectedHtml); QCOMPARE(doc.toHtml(), expectedHtml); } @@ -1960,20 +1957,12 @@ void tst_QTextDocument::toHtmlBodyBgColorTransparent() fmt.setBackground(QColor(255, 0, 0, 0)); doc.rootFrame()->setFrameFormat(fmt); - QString expectedHtml("\n" - "" - "\n" - "

Blah

" - ""); + QString expectedHtml = htmlHead; + expectedHtml.insert(htmlHead.length() - 2, " bgcolor=\"transparent\""); + expectedHtml += "

Blah

" + + htmlTail; - expectedHtml = expectedHtml.arg(defaultFont.family()) - .arg(cssFontSizeString(defaultFont)) - .arg(defaultFont.weight()) - .arg((defaultFont.italic() ? "italic" : "normal")); + writeActualAndExpected(QTest::currentDataTag(), doc.toHtml(), expectedHtml); QCOMPARE(doc.toHtml(), expectedHtml); } @@ -2034,21 +2023,13 @@ void tst_QTextDocument::toHtmlDefaultFontSpacingProperties() fnt.setWordSpacing(15); doc.setDefaultFont(fnt); - QString expectedOutput = QString("\n" - "" - "" - "\n" - "

Blah

" - ""); - expectedOutput = expectedOutput.arg(defaultFont.family()) - .arg(cssFontSizeString(defaultFont)) - .arg(defaultFont.weight()) - .arg((defaultFont.italic() ? "italic" : "normal")); + QString expectedOutput = htmlHead; + expectedOutput.insert(htmlHead.length() - 3, " letter-spacing:13px; word-spacing:15px;"); + expectedOutput += + "

Blah

" + + htmlTail; + + writeActualAndExpected(QTest::currentTestFunction(), doc.toHtml(), expectedOutput); QCOMPARE(doc.toHtml(), expectedOutput); } @@ -2062,23 +2043,13 @@ void tst_QTextDocument::toHtmlTextDecorationUnderline() fnt.setUnderline(true); doc.setDefaultFont(fnt); - QString expectedOutput = - QString("\n" - "" - "" - "\n" - "

Some text

" - ""); + QString expectedOutput = htmlHead; + expectedOutput.insert(htmlHead.length() - 3, " text-decoration: underline;"); + expectedOutput += + "

Some text

" + + htmlTail; - expectedOutput = expectedOutput.arg(doc.defaultFont().family()) - .arg(cssFontSizeString(doc.defaultFont())) - .arg(doc.defaultFont().weight()) - .arg((doc.defaultFont().italic() ? "italic" : "normal")); + writeActualAndExpected("toHtmlTextDecorationUnderline1", doc.toHtml(), expectedOutput); QCOMPARE(doc.toHtml(), expectedOutput); @@ -2087,26 +2058,17 @@ void tst_QTextDocument::toHtmlTextDecorationUnderline() cursor.select(QTextCursor::Document); cursor.mergeCharFormat(format); - QString expectedOutput2 = - QString("\n" - "" - "" - "\n" - "

" - "Some text

" - ""); + expectedOutput = htmlHead; + expectedOutput.insert(htmlHead.length() - 3, " text-decoration: underline;"); + expectedOutput += + "

" + "Some text

" + + htmlTail; - expectedOutput2 = expectedOutput2.arg(doc.defaultFont().family()) - .arg(cssFontSizeString(doc.defaultFont())) - .arg(doc.defaultFont().weight()) - .arg((doc.defaultFont().italic() ? "italic" : "normal")); + writeActualAndExpected("toHtmlTextDecorationUnderline2", doc.toHtml(), expectedOutput); - QCOMPARE(doc.toHtml(), expectedOutput2); + QCOMPARE(doc.toHtml(), expectedOutput); } void tst_QTextDocument::capitalizationHtmlInExport() @@ -2985,21 +2947,11 @@ const QString backgroundImage_html("
void tst_QTextDocument::backgroundImage_checkExpectedHtml(const QTextDocument &doc) { - QString expectedHtml("\n" - "" - "\n" + QString expectedHtml = htmlHead + "" "\n\n
" "\n

Blah

" - "
"); - - expectedHtml = expectedHtml.arg(defaultFont.family()) - .arg(cssFontSizeString(defaultFont)) - .arg(defaultFont.weight()) - .arg((defaultFont.italic() ? "italic" : "normal")); + "
" + htmlTail; writeActualAndExpected(QTest::currentTestFunction(), doc.toHtml(), expectedHtml); diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index c0c52b5c04..24704bec37 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -3499,6 +3499,12 @@ void tst_QTextDocumentFragment::html_hr() doc->setHtml("
"); QCOMPARE(doc->blockCount(), 1); QVERIFY(doc->begin().blockFormat().hasProperty(QTextFormat::BlockTrailingHorizontalRulerWidth)); + doc->setHtml("
"); + QCOMPARE(doc->blockCount(), 1); + QVERIFY(doc->begin().blockFormat().hasProperty(QTextFormat::BlockTrailingHorizontalRulerWidth)); + QVERIFY(doc->begin().blockFormat().hasProperty(QTextFormat::BackgroundBrush)); + const auto brush = qvariant_cast(doc->begin().blockFormat().property(QTextFormat::BackgroundBrush)); + QCOMPARE(brush.color(), QColor("green")); } void tst_QTextDocumentFragment::html_hrMargins()