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

14.7 round 1: the layers edge and the definitions, tested

Browse Source
This commit is contained in:
ZacharyZhang-NY committed 2026-10-11 05:45:48 -04:00
1 parent e1207281a4
commit e320f2cd77
3 files changed
+19 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/CanvasOnlyWindowTests.cpp
+8 -5
View File
@@ -23,7 +23,8 @@ struct Shown : Bar {
QList<bool> chrome()
{
return {window.menuBar()->isVisible(), named("toolbar").isVisible(), named("toolRail").isVisible(), named("statusBar").isVisible(),
named("toolHeader").isVisible(), window.findChild<LayersPanel *>()->isVisible(), window.findChild<CanvasRulerView *>()->isVisible()};
named("toolHeader").isVisible(), window.findChild<LayersPanel *>()->isVisible(), named("layersPanelEdge").isVisible(),
window.findChild<CanvasRulerView *>()->isVisible()};
}
void press(Qt::Key key, Qt::KeyboardModifiers modifiers = {})
{
@@ -48,12 +49,14 @@ void CanvasOnlyWindowTests::fPutsEveryBarAwayAndBringsThemBack()
Shown shown;
QAction &entry = shown.action("toggleFullscreen");
QVERIFY(entry.text() == "Toggle Fullscreen" && entry.isCheckable() && !entry.isChecked() && entry.shortcut() == QKeySequence(Qt::Key_F));
QCOMPARE(shown.chrome(), (QList<bool>{true, true, true, true, true, true, true}));
QCOMPARE(shown.chrome(), (QList<bool>{true, true, true, true, true, true, true, true}));
shown.canvas().setFocus();
shown.press(Qt::Key_F);
QVERIFY(shown.session().canvasOnly() && entry.isChecked());
QVERIFY(shown.window.windowState().testFlag(Qt::WindowFullScreen));
QCOMPARE(shown.chrome(), (QList<bool>{false, false, false, false, false, false, false}));
QCOMPARE(shown.chrome(), (QList<bool>{false, false, false, false, false, false, false, false}));
// Nothing else is left: the canvas fills the window.
QTRY_COMPARE(QRect(shown.canvas().mapTo(&shown.window, QPoint(0, 0)), shown.canvas().size()), shown.window.rect());
// A new tool's bar stays away too.
shown.session().selectTool(NavigationTool::brush);
QVERIFY(!shown.named("toolHeader").isVisible());
@@ -67,7 +70,7 @@ void CanvasOnlyWindowTests::fPutsEveryBarAwayAndBringsThemBack()
shown.press(Qt::Key_F);
QVERIFY(!shown.session().canvasOnly() && !entry.isChecked());
QVERIFY(!shown.window.windowState().testFlag(Qt::WindowFullScreen));
QCOMPARE(shown.chrome(), (QList<bool>{true, true, true, true, true, true, true}));
QCOMPARE(shown.chrome(), (QList<bool>{true, true, true, true, true, true, true, true}));
}
void CanvasOnlyWindowTests::theCanvasSitsOnBlack()
@@ -113,7 +116,7 @@ void CanvasOnlyWindowTests::escapeLeavesOnceNothingIsLeftToCancel()
}
shown.press(Qt::Key_Escape);
QVERIFY(!shown.session().canvasOnly() && !shown.action("toggleFullscreen").isChecked());
QCOMPARE(shown.chrome(), (QList<bool>{true, true, true, true, true, true, true}));
QCOMPARE(shown.chrome(), (QList<bool>{true, true, true, true, true, true, true, true}));
// Out of Canvas Only, Escape is the canvas's alone.
shown.press(Qt::Key_Escape);
QVERIFY(!shown.session().canvasOnly());
tests/KeyboardShortcutsTests.cpp
+10
View File
@@ -109,6 +109,16 @@ void KeyboardShortcutsTests::theListIsSwiftsWithoutHide()
QCOMPARE(named("Increase leading by 10").original, ShortcutChord(QString(QChar(0xf701)), 10));
QCOMPARE(named("Toggle Levels preview").group, QString("Canvas & Layers"));
QCOMPARE(named("Undo").id(), QString("Menus:Undo"));
// Swift 1.4.7: Search Commands, then Fullscreen first in Canvas.
const auto at = [&](const QString &title) {
return std::ranges::find_if(all, [&](const ShortcutDefinition &d) { return d.title == title; }) - all.begin();
};
QCOMPARE(named("Search Commands").original, ShortcutChord("f", 1));
QVERIFY(named("Search Commands").isMenu() && at("Search Commands") == at("Fit Canvas") + 1);
const ShortcutDefinition fullscreen = named("Toggle Fullscreen: the canvas alone on black (Esc also leaves)");
QCOMPARE(fullscreen.original, ShortcutChord("f"));
QCOMPARE(fullscreen.group, QString("Canvas & Layers"));
QCOMPARE(std::ranges::find_if(all, [](const ShortcutDefinition &d) { return !d.isMenu(); })->title, fullscreen.title);
// Swift's defaults hold together.
QVERIFY(!ShortcutSettings::problem({}));
}