From 35b136944656c9ff9c3b064f47be08224f76c1f9 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Thu, 24 Sep 2026 18:56:08 +0200 Subject: feat: close the calendar's event pane with Escape Escape was scoped to the pane and only cancelled an edit, so once an event was selected nothing closed the pane again. It is a window shortcut now, labelled Close event: with no edit open it clears the selection and the pane hides. With an edit open it cancels only when focus is inside the pane, so a stray Escape after clicking the grid cannot discard the form. That guard needed the month grid to take focus on a click, which it never did; the view-scoped PgUp/PgDn, Delete and Ctrl+Z were likewise reachable only by Tab until now. Co-Authored-By: Claude Opus 5.5 --- tests/test_calendarwindow.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests/test_calendarwindow.cpp') diff --git a/tests/test_calendarwindow.cpp b/tests/test_calendarwindow.cpp index 5591b2b..ea83f12 100644 --- a/tests/test_calendarwindow.cpp +++ b/tests/test_calendarwindow.cpp @@ -128,6 +128,7 @@ private slots: void aFreshWindowShowsTheCurrentMonth(); void aStaleSaveCanBeRetried(); void aRolledBackWriteIsNotReportedLostAfterSync(); + void escapeClosesTheDetailsButNotAnEditFromOutsideThePane(); }; void TestCalendarWindow::loadsAndSelects() @@ -320,5 +321,23 @@ void TestCalendarWindow::aRolledBackWriteIsNotReportedLostAfterSync() 5000); } + +void TestCalendarWindow::escapeClosesTheDetailsButNotAnEditFromOutsideThePane() +{ + Fixture f; + std::unique_ptr w(f.window()); + auto *close = w->findChild(QStringLiteral("cancelEdit")); + QVERIFY(close); + QVERIFY(w->selectEvent(QStringLiteral("one@example.org"))); + close->trigger(); + QVERIFY(w->selectedUid().isEmpty()); + + // Focus is nowhere inside the pane, as after a click on the grid. + QVERIFY(w->selectEvent(QStringLiteral("one@example.org"))); + editTitle(w.get(), QStringLiteral("Changed")); + close->trigger(); + QVERIFY(w->isEditing()); +} + QTEST_MAIN(TestCalendarWindow) #include "test_calendarwindow.moc" -- cgit v1.2.3