mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-07 10:33:24 -08:00
[Icons] Show the trash can with the sticker treatment again
The sticker sheet kept the delete glyph out of the sticker rows and explained why: at toolbar sizes the rim closed the lid gap. The icon is used with the sticker treatment again for destructive actions, so the sheet now shows it and the exception note is gone.
This commit is contained in:
parent
43f146e9fc
commit
268a32464c
1 changed files with 2 additions and 7 deletions
|
|
@ -859,6 +859,7 @@ TEST(IconStickerPreview, WritesPngsWhenRequested)
|
|||
{"increment", AppColor::Positive},
|
||||
{"decrement", AppColor::Negative},
|
||||
{"remove_row", AppColor::Negative},
|
||||
{"delete", AppColor::Negative},
|
||||
};
|
||||
constexpr int SIZES[] = {15, 16, 24, 48};
|
||||
constexpr int CONTEXT_SIZE = 32;
|
||||
|
|
@ -888,7 +889,7 @@ TEST(IconStickerPreview, WritesPngsWhenRequested)
|
|||
|
||||
const int logicalWidth = MARGIN + LABEL_WIDTH + static_cast<int>(std::size(SIZES)) * CELL_WIDTH + MARGIN;
|
||||
const int logicalHeight = MARGIN + 24 + 24 + static_cast<int>(std::size(stickered)) * GLYPH_BLOCK_HEIGHT + 24 + 24 +
|
||||
CONTEXT_SIZE + 46 + CONTEXT_SIZE + 46 + 20 + MARGIN;
|
||||
CONTEXT_SIZE + 46 + CONTEXT_SIZE + 46 + MARGIN;
|
||||
const QSize imageSize(qRound(logicalWidth * DPR), qRound(logicalHeight * DPR));
|
||||
|
||||
for (const bool dark : {false, true}) {
|
||||
|
|
@ -978,12 +979,6 @@ TEST(IconStickerPreview, WritesPngsWhenRequested)
|
|||
}
|
||||
}
|
||||
|
||||
y += CONTEXT_SIZE + 46;
|
||||
painter.drawText(
|
||||
QPointF(MARGIN, y),
|
||||
QStringLiteral(
|
||||
"The clear-filter trash can keeps the line treatment; a sticker rim closes its lid at toolbar sizes."));
|
||||
|
||||
painter.end();
|
||||
const QString path = QDir(outDir).absoluteFilePath(dark ? QStringLiteral("sticker-preview-dark.png")
|
||||
: QStringLiteral("sticker-preview-light.png"));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue