From f516d21913d684833698e6e09ba174082c189142 Mon Sep 17 00:00:00 2001 From: David <97603719+Commodore64user@users.noreply.github.com> Date: Sun, 2 Feb 2025 12:31:27 +0000 Subject: [PATCH] [SortWidget] add cancelOrClose method (#13189) --- frontend/ui/widget/sortwidget.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/ui/widget/sortwidget.lua b/frontend/ui/widget/sortwidget.lua index 81c1b6200..9c3598862 100644 --- a/frontend/ui/widget/sortwidget.lua +++ b/frontend/ui/widget/sortwidget.lua @@ -348,7 +348,7 @@ end function SortWidget:registerKeyEvents() if Device:hasKeys() then - self.key_events.Close = { { Device.input.group.Back } } + self.key_events.CancelOrClose = { { Device.input.group.Back } } self.key_events.NextPage = { { Device.input.group.PgFwd } } self.key_events.PrevPage = { { Device.input.group.PgBack } } self.key_events.ShowWidgetMenu = { { "Menu" } } @@ -580,6 +580,15 @@ function SortWidget:onClose() return true end +function SortWidget:onCancelOrClose() + if self.marked > 0 then + self:onCancel() + else + self:onClose() + end + return true +end + function SortWidget:onCancel() self.marked = 0 if self.orig_item_table then