whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't let text table cells shrink below their minimum width 

We calculate the minimum width, but then use it only to make sure that
the maximum width is at least as large as it. Without setting the layout
struct's minimumWidth as well, table cells can be smaller.

Add a test case.

Fixes: QTBUG-86671
Fixes: QTBUG-97463
Pick-to: 6.2 5.15
Change-Id: Idf4ad015938abb8d3e599e9a58e002f29c0067be
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
bb10
Volker Hilsheimer 2021-11-25 12:28:07 +01:00
parent 4a8bc3f9cc
commit 97cfd49401
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/qtextdocumentlayout.cpp
View File

@ -2369,6 +2369,7 @@ QTextLayoutStruct QTextDocumentLayoutPrivate::layoutCell(QTextTable *t, const QT
// constraint the maximumWidth by the minimum width of the fixed size floats, to
// keep them visible
layoutStruct.maximumWidth = qMax(layoutStruct.maximumWidth, floatMinWidth);
layoutStruct.minimumWidth = floatMinWidth;
// as floats in cells get added to the table's float list but must not affect
// floats in other cells we must clear the list here.

61
tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
View File

@ -29,7 +29,7 @@
#include <QTest>
#include <qbuffer.h>
#include <qtextdocument.h>
#include <qtextdocumentfragment.h>
#include <qtexttable.h>
@ -103,6 +103,9 @@ private slots:
#ifndef QT_NO_WIDGETS
void columnWidthWithSpans();
void columnWidthWithImage_data();
void columnWidthWithImage();
#endif
private:
@ -1304,7 +1307,63 @@ void tst_QTextTable::columnWidthWithSpans()
const QRectF afterRect = table->document()->documentLayout()->blockBoundingRect(block);
QCOMPARE(afterRect, beforeRect);
}
void tst_QTextTable::columnWidthWithImage_data()
{
const auto imageHtml = [](int width, int height) {
QImage image(width, height, QImage::Format_RGB32);
image.fill(Qt::red);
QByteArray imageBytes;
QBuffer buffer(&imageBytes);
buffer.open(QIODevice::WriteOnly);
image.save(&buffer, "png");
return QString("<td><img src='data:image/png;base64,%1'/></td>").arg(imageBytes.toBase64());
};
QTest::addColumn<QString>("leftHtml");
QTest::addColumn<QString>("rightHtml");
QTest::addColumn<QSize>("imageSize");
QTest::addRow("image")
<< imageHtml(500, 32) << "<td></td>" << QSize(500, 32);
QTest::addRow("image, text")
<< imageHtml(32, 32) << "<td>abc</td>" << QSize(32, 32);
QTest::addRow("image, 100%% text")
<< imageHtml(32, 32) << "<td style='background-color: grey' width='100%'>abc</td>"
<< QSize(32, 32);
QTest::addRow("image, image")
<< imageHtml(256, 32) << imageHtml(256, 32) << QSize(256, 32);
}
void tst_QTextTable::columnWidthWithImage()
{
const QString tableTemplate = "<table><tr>%1 %2</tr></table>";
QFETCH(QString, leftHtml);
QFETCH(QString, rightHtml);
QFETCH(QSize, imageSize);
QTextDocument doc;
doc.setHtml(tableTemplate.arg(leftHtml).arg(rightHtml));
QTextEdit textEdit;
textEdit.setDocument(&doc);
textEdit.show();
QVERIFY(QTest::qWaitForWindowExposed(&textEdit));
QTextCursor cursor(doc.firstBlock());
cursor.movePosition(QTextCursor::Right);
QTextTable *currentTable = cursor.currentTable();
QVERIFY(currentTable);
QTextBlock block = currentTable->cellAt(0, 0).firstCursorPosition().block();
const QRectF leftRect = currentTable->document()->documentLayout()->blockBoundingRect(block);
block = currentTable->cellAt(0, 1).firstCursorPosition().block();
const QRectF rightRect = currentTable->document()->documentLayout()->blockBoundingRect(block);
QCOMPARE(leftRect.size().toSize(), imageSize);
QVERIFY(rightRect.left() > leftRect.right());
}
#endif
QTEST_MAIN(tst_QTextTable)
#include "tst_qtexttable.moc"