ZacharyZhang-NY/OmaPhoto
1
1 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

14.11: the Layers footer's buttons in the primary ink, dimmed as the menus

Browse Source
This commit is contained in:
ZacharyZhang-NY committed 2026-10-11 07:01:32 -04:00
1 parent e0ba02707e
commit 9611cfa11c
6 files changed
+88 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/LayerListFocusTests.cpp
+5 -3
View File
@@ -169,13 +169,15 @@ void LayerListFocusTests::aNewPaletteRedrawsEveryIcon()
QApplication::setPalette(changed);
const double ratio = panel.devicePixelRatio();
auto *add = panel.findChild<QToolButton *>("addBlankLayer");
QTRY_COMPARE(iconImage(add->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::newLayer, 16, QColor(10, 200, 30), ratio), 16));
QCOMPARE(iconImage(panel.findChild<QToolButton *>("addLayerMask")->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::addMask, 16, QColor(10, 200, 30), ratio), 16));
// Buttons take the primary ink since 14.11; menus the secondary.
QTRY_COMPARE(iconImage(add->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::newLayer, 16, QColor(200, 10, 30), ratio), 16));
QCOMPARE(iconImage(panel.findChild<QToolButton *>("addLayerMask")->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::addMask, 16, QColor(200, 10, 30), ratio), 16));
QCOMPARE(iconImage(panel.findChild<QToolButton *>("layerEffects")->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::sparkles, 16, QColor(10, 200, 30), ratio), 16));
LayerCell &folder = *panel.list().cells().at(0);
QTRY_COMPARE(iconImage(folder.findChild<QToolButton *>("layerEye")->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::eye, 16, QColor(200, 10, 30), ratio), 16));
QCOMPARE(iconImage(folder.thumbnail().icon(), 36), iconImage(LayerIcons::pixmap(LayerIcon::folder, 36 * 0.8, QColor(200, 10, 30), ratio), 36));
QApplication::setPalette(before);
QTRY_COMPARE(iconImage(add->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::newLayer, 16, before.color(QPalette::PlaceholderText), ratio), 16));
QTRY_COMPARE(iconImage(add->icon(), 16), iconImage(LayerIcons::pixmap(LayerIcon::newLayer, 16, before.color(QPalette::Active, QPalette::WindowText), ratio), 16));
}
void LayerListFocusTests::aSwipeReleasedOverAPopupStillEnds()