From 09ea47f8113bdce437253b19a91f739aeef7a333 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 10 Apr 2024 16:45:23 +0200 Subject: [PATCH] Improve default style of QTextTable Collapse the border and add some padding for the table cells. [ChangeLog][QtGui][Text] QTextTableFormat now defaults to collapsed tables with no spacing between cells. Change-Id: Ibebc92820447bd5fd9c0b905261dc4426b74358c Reviewed-by: Shawn Rutledge --- src/gui/text/qtextformat.cpp | 3 +- .../text/qtextdocument/tst_qtextdocument.cpp | 28 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 3e4bacf78cf..daa79a55d2d 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -3156,7 +3156,8 @@ QTextTableFormat::QTextTableFormat() : QTextFrameFormat() { setObjectType(TableObject); - setCellSpacing(2); + setCellPadding(4); + setBorderCollapse(true); setBorder(1); } diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 40f78ed7787..335ee06e2f2 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -1172,7 +1172,7 @@ void tst_QTextDocument::toHtml_data() cursor.insertTable(2, 2); QTest::newRow("simpletable") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n\n" "\n\n\n" "
"); @@ -1186,7 +1186,7 @@ void tst_QTextDocument::toHtml_data() table->mergeCells(0, 2, 1, 2); QTest::newRow("tablespans") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n\n" "
"); } @@ -1205,7 +1205,7 @@ void tst_QTextDocument::toHtml_data() cursor.insertTable(2, 2, fmt); QTest::newRow("tableattrs") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n\n" "\n\n\n" "
"); @@ -1227,7 +1227,7 @@ void tst_QTextDocument::toHtml_data() cursor.insertTable(2, 2, fmt); QTest::newRow("tableattrs2") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n\n" "\n\n\n" "
"); @@ -1241,7 +1241,7 @@ void tst_QTextDocument::toHtml_data() cursor.insertTable(4, 2, fmt); QTest::newRow("tableheader") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n\n" "\n\n\n" "\n\n\n" @@ -1257,8 +1257,8 @@ void tst_QTextDocument::toHtml_data() subTable->cellAt(0, 0).firstCursorPosition().insertText("Hey"); QTest::newRow("nestedtable") << QTextDocumentFragment(&doc) - << QString("
" - "\n\n\n" + << QString("
\n\n\n
\n

Hey

" + "\n\n\n" "\n\n\n" "
\n\n\n
\n

Hey

"); } @@ -1275,7 +1275,7 @@ void tst_QTextDocument::toHtml_data() cursor.insertTable(1, 3, fmt); QTest::newRow("colwidths") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n\n\n" "
"); } @@ -1292,7 +1292,7 @@ void tst_QTextDocument::toHtml_data() cellCurs.mergeBlockCharFormat(fmt); QTest::newRow("cellproperties") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n" "
"); } @@ -1559,7 +1559,7 @@ void tst_QTextDocument::toHtml_data() table->setFormat(fmt); QTest::newRow("mergedtablecolwidths") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n" "\n\n\n" "
"); @@ -1622,7 +1622,7 @@ void tst_QTextDocument::toHtml_data() table->cellAt(0, 0).firstCursorPosition().insertText("Blah"); QTest::newRow("table-vertical-alignment") << QTextDocumentFragment(&doc) - << QString("" + << QString("
" "\n\n" "\n" @@ -1651,7 +1651,7 @@ void tst_QTextDocument::toHtml_data() table->cellAt(0, 0).firstCursorPosition().insertText("Blah"); QTest::newRow("table-cell-paddings") << QTextDocumentFragment(&doc) - << QString("
\n" "

Blah

" + << QString("
" "\n\n" "\n" @@ -1669,7 +1669,7 @@ void tst_QTextDocument::toHtml_data() cursor.insertTable(2, 2, fmt); QTest::newRow("tableborder") << QTextDocumentFragment(&doc) - << QString("
\n" "

Blah

" + << QString("
" "\n\n\n" "\n\n\n" "
"); @@ -1711,7 +1711,7 @@ void tst_QTextDocument::toHtml_data() << QString("EMPTYBLOCK") + QString("

Foo

" "\n

Bar

" - "\n\n\n
"); + "\n\n\n
"); } {