1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QWidget::renderInvisible: Use QImage::Format_ARGB32_Premultiplied

Browse Source 
The test renders QCalendarWidget, which ends up in the QStyle code
eventually. On macOS we use a CGContext to draw the native style,
into the test's image/paint device, but CGBitmapContextCreate does
not support QImage::Format_ARGB32. It needs either a premultiplied
alpha, or no alpha at all.

The unification of the palette for the calendar, as is done for
Windows, is also needed on macOS.

Change-Id: I5b26e5434b84e4b14eb8784875b76810e0a14230
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a5292ad2f58252f392ad272f8c99a31c43d175a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-01-19 12:46:46 +01:00 committed by Qt Cherry-pick Bot
parent 590e1c9cdb
commit 2804455965
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/kernel/qwidget/BLACKLIST
View File

@ -1,7 +1,5 @@
[raise] [raise]
opensuse-leap opensuse-leap
[renderInvisible]
macos
[optimizedResizeMove] [optimizedResizeMove]
osx osx
[optimizedResize_topLevel] [optimizedResize_topLevel]

31
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -7957,15 +7957,12 @@ void tst_QWidget::renderTargetOffset()
QCOMPARE(image.pixel(120, 120), QColor(Qt::blue).rgb()); QCOMPARE(image.pixel(120, 120), QColor(Qt::blue).rgb());
} }
// On Windows the active palette is used instead of the inactive palette even // On some platforms the active palette is used instead of the inactive palette even
// though the widget is invisible. This is probably related to task 178507/168682, // though the widget is invisible, but for the renderInvisible test it doesn't matter,
// but for the renderInvisible test it doesn't matter, we're mostly interested // as we're mostly interested in testing the geometry, so just workaround the palette
// in testing the geometry so just workaround the palette issue for now. // issue for now.
static void workaroundPaletteIssue(QWidget *widget) static void workaroundPaletteIssue(QWidget *widget)
{ {
#ifndef Q_OS_WIN
return;
#endif
if (!widget) if (!widget)
return; return;
@ -8009,7 +8006,7 @@ void tst_QWidget::renderInvisible()
// Create normal reference image. // Create normal reference image.
const QSize calendarSize = calendar->size(); const QSize calendarSize = calendar->size();
QImage referenceImage(calendarSize, QImage::Format_ARGB32); QImage referenceImage(calendarSize, QImage::Format_ARGB32_Premultiplied);
calendar->render(&referenceImage); calendar->render(&referenceImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
referenceImage.save("referenceImage.png"); referenceImage.save("referenceImage.png");
@ -8020,7 +8017,7 @@ void tst_QWidget::renderInvisible()
const QSize calendarSizeResized = calendar->size() + QSize(50, 50); const QSize calendarSizeResized = calendar->size() + QSize(50, 50);
calendar->resize(calendarSizeResized); calendar->resize(calendarSizeResized);
QTest::qWait(30); QTest::qWait(30);
QImage referenceImageResized(calendarSizeResized, QImage::Format_ARGB32); QImage referenceImageResized(calendarSizeResized, QImage::Format_ARGB32_Premultiplied);
calendar->render(&referenceImageResized); calendar->render(&referenceImageResized);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
referenceImageResized.save("referenceImageResized.png"); referenceImageResized.save("referenceImageResized.png");
@ -8033,7 +8030,7 @@ void tst_QWidget::renderInvisible()
workaroundPaletteIssue(calendar.data()); workaroundPaletteIssue(calendar.data());
{ // Make sure we get the same image when the calendar is explicitly hidden. { // Make sure we get the same image when the calendar is explicitly hidden.
QImage testImage(calendarSizeResized, QImage::Format_ARGB32); QImage testImage(calendarSizeResized, QImage::Format_ARGB32_Premultiplied);
calendar->render(&testImage); calendar->render(&testImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("explicitlyHiddenCalendarResized.png"); testImage.save("explicitlyHiddenCalendarResized.png");
@ -8049,7 +8046,7 @@ void tst_QWidget::renderInvisible()
workaroundPaletteIssue(calendar.data()); workaroundPaletteIssue(calendar.data());
{ // Never been visible, created or laid out. { // Never been visible, created or laid out.
QImage testImage(calendarSize, QImage::Format_ARGB32); QImage testImage(calendarSize, QImage::Format_ARGB32_Premultiplied);
calendar->render(&testImage); calendar->render(&testImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("neverBeenVisibleCreatedOrLaidOut.png"); testImage.save("neverBeenVisibleCreatedOrLaidOut.png");
@ -8061,7 +8058,7 @@ void tst_QWidget::renderInvisible()
QTest::qWait(30); QTest::qWait(30);
{ // Calendar explicitly hidden. { // Calendar explicitly hidden.
QImage testImage(calendarSize, QImage::Format_ARGB32); QImage testImage(calendarSize, QImage::Format_ARGB32_Premultiplied);
calendar->render(&testImage); calendar->render(&testImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("explicitlyHiddenCalendar.png"); testImage.save("explicitlyHiddenCalendar.png");
@ -8075,7 +8072,7 @@ void tst_QWidget::renderInvisible()
navigationBar->hide(); navigationBar->hide();
{ // Check that the navigation bar isn't drawn when rendering the entire calendar. { // Check that the navigation bar isn't drawn when rendering the entire calendar.
QImage testImage(calendarSize, QImage::Format_ARGB32); QImage testImage(calendarSize, QImage::Format_ARGB32_Premultiplied);
calendar->render(&testImage); calendar->render(&testImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("calendarWithoutNavigationBar.png"); testImage.save("calendarWithoutNavigationBar.png");
@ -8084,7 +8081,7 @@ void tst_QWidget::renderInvisible()
} }
{ // Make sure the navigation bar renders correctly even though it's hidden. { // Make sure the navigation bar renders correctly even though it's hidden.
QImage testImage(navigationBar->size(), QImage::Format_ARGB32); QImage testImage(navigationBar->size(), QImage::Format_ARGB32_Premultiplied);
navigationBar->render(&testImage); navigationBar->render(&testImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("explicitlyHiddenNavigationBar.png"); testImage.save("explicitlyHiddenNavigationBar.png");
@ -8098,7 +8095,7 @@ void tst_QWidget::renderInvisible()
{ // Render next month button. { // Render next month button.
// Fill test image with correct background color. // Fill test image with correct background color.
QImage testImage(nextMonthButton->size(), QImage::Format_ARGB32); QImage testImage(nextMonthButton->size(), QImage::Format_ARGB32_Premultiplied);
navigationBar->render(&testImage, QPoint(), QRegion(), QWidget::RenderFlags()); navigationBar->render(&testImage, QPoint(), QRegion(), QWidget::RenderFlags());
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("nextMonthButtonBackground.png"); testImage.save("nextMonthButtonBackground.png");
@ -8136,7 +8133,7 @@ void tst_QWidget::renderInvisible()
QCoreApplication::processEvents(); QCoreApplication::processEvents();
{ // Make sure we get an image equal to the resized reference image. { // Make sure we get an image equal to the resized reference image.
QImage testImage(calendarSizeResized, QImage::Format_ARGB32); QImage testImage(calendarSizeResized, QImage::Format_ARGB32_Premultiplied);
calendar->render(&testImage); calendar->render(&testImage);
#ifdef RENDER_DEBUG #ifdef RENDER_DEBUG
testImage.save("calendarResized.png"); testImage.save("calendarResized.png");
@ -8148,7 +8145,7 @@ void tst_QWidget::renderInvisible()
QCalendarWidget calendar; QCalendarWidget calendar;
const QSize calendarSize = calendar.sizeHint(); const QSize calendarSize = calendar.sizeHint();
QImage image(2 * calendarSize, QImage::Format_ARGB32); QImage image(2 * calendarSize, QImage::Format_ARGB32_Premultiplied);
image.fill(QColor(Qt::red).rgb()); image.fill(QColor(Qt::red).rgb());
calendar.render(&image); calendar.render(&image);