From 19728d3e3cf54908480650870c56f19793f77d0b Mon Sep 17 00:00:00 2001 From: albertonoys <3334359+albertonoys@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:29:07 +0100 Subject: [PATCH 1/2] feat(store): show the sort order when tab changes it - tab cycled the sort order with nothing on screen saying so; it now shows "Sort: " in the status line - sort_rule_label(), unused until now, returns readable names --- main/interface/appstore_client.cpp | 10 +++++----- main/ui/catalog_controller.cpp | 2 +- tests/test_appstore_input_controller.cpp | 1 + tests/test_appstore_request_coordinator.cpp | 1 + tests/test_catalog_controller.cpp | 6 ++++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/main/interface/appstore_client.cpp b/main/interface/appstore_client.cpp index b31e124..c0e9e11 100644 --- a/main/interface/appstore_client.cpp +++ b/main/interface/appstore_client.cpp @@ -336,12 +336,12 @@ std::vector split_csv_paths(const std::string &value) std::string sort_rule_label(SortRule rule) { switch (rule) { - case SortRule::New: return "new"; - case SortRule::Old: return "old"; - case SortRule::AtoZ: return "a-z"; - case SortRule::ZtoA: return "z-a"; + case SortRule::New: return "Newest first"; + case SortRule::Old: return "Oldest first"; + case SortRule::AtoZ: return "A-Z"; + case SortRule::ZtoA: return "Z-A"; case SortRule::Default: - default: return "def"; + default: return "Default"; } } diff --git a/main/ui/catalog_controller.cpp b/main/ui/catalog_controller.cpp index bfa7714..87c431b 100644 --- a/main/ui/catalog_controller.cpp +++ b/main/ui/catalog_controller.cpp @@ -113,7 +113,7 @@ void CatalogController::cycle_sort_rule() sort_apps(session_.catalog.apps(), session_.catalog.sort_rule()); session_.catalog.rebuild_visible(); if (!select_visible_app_by_id(selected_id)) session_.catalog.selected_index() = 0; - session_.status.value().clear(); + session_.status.value() = "Sort: " + sort_rule_label(session_.catalog.sort_rule()); } void CatalogController::apply_summary(const SummaryData &summary) diff --git a/tests/test_appstore_input_controller.cpp b/tests/test_appstore_input_controller.cpp index e360b7e..3ecf166 100644 --- a/tests/test_appstore_input_controller.cpp +++ b/tests/test_appstore_input_controller.cpp @@ -45,6 +45,7 @@ bool can_upgrade_app(const StoreApp &app) std::string backend_error_message(const std::string &output) { return output; } std::string sync_status_message(const std::string &) { return "Catalog synced"; } void sort_apps(std::vector &, SortRule) {} +std::string sort_rule_label(SortRule) { return ""; } } // namespace appstore diff --git a/tests/test_appstore_request_coordinator.cpp b/tests/test_appstore_request_coordinator.cpp index 1e0264a..76beb2a 100644 --- a/tests/test_appstore_request_coordinator.cpp +++ b/tests/test_appstore_request_coordinator.cpp @@ -21,6 +21,7 @@ std::string one_line(std::string value, size_t max_len) } std::string match_key(std::string value) { return value; } void sort_apps(std::vector &, SortRule) {} +std::string sort_rule_label(SortRule) { return ""; } std::vector wrap_display_text(std::string text, int) { return {std::move(text)}; } bool has_blocking_missing(const std::string &missing) { return !missing.empty(); } std::string missing_install_message(const std::string &) { return "Missing dependencies"; } diff --git a/tests/test_catalog_controller.cpp b/tests/test_catalog_controller.cpp index 22cd157..e87279a 100644 --- a/tests/test_catalog_controller.cpp +++ b/tests/test_catalog_controller.cpp @@ -26,6 +26,11 @@ void sort_apps(std::vector &apps, SortRule rule) }); } +std::string sort_rule_label(SortRule rule) +{ + return rule == SortRule::New ? "Newest first" : "other"; +} + } // namespace appstore int main() @@ -83,6 +88,7 @@ int main() assert(controller.select_visible_app_by_id("b-id")); controller.cycle_sort_rule(); assert(session.catalog.sort_rule() == appstore::SortRule::New); + assert(session.status.value() == "Sort: Newest first"); assert(session.catalog.selected_app()->id == "b-id"); controller.open_share_code(1000); From 2e416aa3fb8cb66b0eadb2361f93a359d6f80247 Mon Sep 17 00:00:00 2001 From: albertonoys <3334359+albertonoys@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:31:01 +0100 Subject: [PATCH 2/2] fix(store): show the first app after changing the sort order - the catalog shows one app at a time, so keeping the selected app made tab look like it did nothing --- main/ui/catalog_controller.cpp | 4 +--- tests/test_catalog_controller.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/main/ui/catalog_controller.cpp b/main/ui/catalog_controller.cpp index 87c431b..9c35598 100644 --- a/main/ui/catalog_controller.cpp +++ b/main/ui/catalog_controller.cpp @@ -101,8 +101,6 @@ void CatalogController::select_adjacent_category(int delta) void CatalogController::cycle_sort_rule() { - StoreApp *app = session_.catalog.selected_app(); - const std::string selected_id = app ? app->id : ""; switch (session_.catalog.sort_rule()) { case SortRule::Default: session_.catalog.sort_rule() = SortRule::New; break; case SortRule::New: session_.catalog.sort_rule() = SortRule::Old; break; @@ -112,7 +110,7 @@ void CatalogController::cycle_sort_rule() } sort_apps(session_.catalog.apps(), session_.catalog.sort_rule()); session_.catalog.rebuild_visible(); - if (!select_visible_app_by_id(selected_id)) session_.catalog.selected_index() = 0; + session_.catalog.selected_index() = 0; session_.status.value() = "Sort: " + sort_rule_label(session_.catalog.sort_rule()); } diff --git a/tests/test_catalog_controller.cpp b/tests/test_catalog_controller.cpp index e87279a..9f6b4d6 100644 --- a/tests/test_catalog_controller.cpp +++ b/tests/test_catalog_controller.cpp @@ -89,7 +89,7 @@ int main() controller.cycle_sort_rule(); assert(session.catalog.sort_rule() == appstore::SortRule::New); assert(session.status.value() == "Sort: Newest first"); - assert(session.catalog.selected_app()->id == "b-id"); + assert(session.catalog.selected_index() == 0); controller.open_share_code(1000); share_code.input() = "aaaa";