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

Masks as Photoshop's: the button reveals the selection, Alt-click shows a mask alone (13.12)

Browse Source
This commit is contained in:
ZacharyZhang-NY committed 2026-10-01 18:04:14 -04:00
1 parent cc9bf95722
commit 0b0d36a7df
28 files changed
+554 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/LayersPanelTests.cpp
+25 -11
View File
@@ -188,22 +188,36 @@ void LayersPanelTests::theMaskButtonUsesTheSelection()
panel.show();
QVERIFY(QTest::qWaitForWindowExposed(&panel));
auto &mask = find<QToolButton>(panel, "addLayerMask");
QCOMPARE(mask.toolTip(), QString("Add layer mask"));
QCOMPARE(mask.toolTip(), QString("Add layer mask (Alt-click for a black mask)"));
// Alt-click: all black without a selection.
QTest::mouseClick(&mask, Qt::LeftButton, Qt::AltModifier);
QCOMPARE(session.history.undoName(), QString("Add Hide-All Mask"));
session.undo();
QTest::mouseClick(&mask, Qt::LeftButton);
QCOMPARE(session.history.undoName(), QString("Add Reveal-All Mask"));
session.undo();
QPainterPath box;
box.addRect(QRectF(20, 10, 30, 20));
session.applySelection(box, SelectionMode::replace, "Select");
QCOMPARE(mask.toolTip(), QString("Add layer mask (the selection becomes black)"));
QCOMPARE(mask.toolTip(), QString("Add layer mask revealing the selection (Alt-click to hide it)"));
// The button reveals the selection, as Photoshop's.
QTest::mouseClick(&mask, Qt::LeftButton);
QCOMPARE(session.history.undoName(), QString("Add Mask from Selection"));
QCOMPARE(session.history.undoName(), QString("Reveal Selection"));
QVERIFY(!session.selection().has_value() && session.isMaskSelected() && !mask.isEnabled());
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(20)[30]), 0);
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(5)[5]), 255);
// The row's menu: black shows only the selection.
session.undo();
QVERIFY(session.selection().has_value());
LayerCell &cell = *panel.list().cells().at(0);
panel.list().menuFor(cell, QPoint(cell.width() - 20, 20))->findChild<QAction *>("addBlackMask")->trigger();
QCOMPARE(session.history.undoName(), QString("Add Mask from Selection"));
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(20)[30]), 255);
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(5)[5]), 0);
// Alt-click hides it instead.
session.undo();
QVERIFY(session.selection().has_value());
QTest::mouseClick(&mask, Qt::LeftButton, Qt::AltModifier);
QCOMPARE(session.history.undoName(), QString("Hide Selection"));
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(20)[30]), 0);
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(5)[5]), 255);
// The row's Hide All hides the selection too.
session.undo();
LayerCell &cell = *panel.list().cells().at(0);
panel.list().menuFor(cell, QPoint(cell.width() - 20, 20))->findChild<QAction *>("addBlackMask")->trigger();
QCOMPARE(session.history.undoName(), QString("Hide Selection"));
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(20)[30]), 0);
QCOMPARE(int(session.activeLayer().value().mask.value().asset.image().constScanLine(5)[5]), 255);
}