jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-07 10:33:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Icons] Apply the CI clang-format output to the treatment preview

Browse source 
clang-format 18 wraps the family label and the glyph x offset differently from
the local clang-format 23. The preview test takes the CI output so the bottom
of the stack passes the style job on its own.
This commit is contained in:
Lukas Brübach 2026-11-07 11:04:25 +01:00
parent 268a32464c
commit 92b94c4ed7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/theme_migration/icon_treatment_preview_test.cpp
View file

@ -197,10 +197,10 @@ TEST(IconTreatmentPreview, WritesOneSheetPerShippedTheme)
painter.setPen(text); painter.setPen(text);
painter.setFont(QFont(QStringLiteral("Sans"), 8, QFont::DemiBold)); painter.setFont(QFont(QStringLiteral("Sans"), 8, QFont::DemiBold));
painter.drawText(QPointF(contentLeft, y + 14), painter.drawText(
QStringLiteral("%1%2").arg( QPointF(contentLeft, y + 14),
QString::fromLatin1(family.name), QStringLiteral("%1%2").arg(QString::fromLatin1(family.name),
isDisabled ? QStringLiteral(" / disabled") : QString())); isDisabled ? QStringLiteral(" / disabled") : QString()));
painter.setFont(QFont(QStringLiteral("Mono"), 7)); painter.setFont(QFont(QStringLiteral("Mono"), 7));
painter.drawText(QPointF(contentLeft, y + 28), ink.name(QColor::HexRgb)); painter.drawText(QPointF(contentLeft, y + 28), ink.name(QColor::HexRgb));
@ -223,8 +223,8 @@ TEST(IconTreatmentPreview, WritesOneSheetPerShippedTheme)
} }
return ThemeIconBadge::renderBadge(svg, ink, pixelSize); return ThemeIconBadge::renderBadge(svg, ink, pixelSize);
}); });
const qreal x = cellX + 6 + static_cast<qreal>(glyphIndex) * SLOT + const qreal x =
(SLOT - side) / 2.0; cellX + 6 + static_cast<qreal>(glyphIndex) * SLOT + (SLOT - side) / 2.0;
painter.drawPixmap(QPointF(x, rowTop + (SLOT - side) / 2.0), pixmap); painter.drawPixmap(QPointF(x, rowTop + (SLOT - side) / 2.0), pixmap);
} }
} }