From 415ce40f84bc9aeea4c1cce819abc0bc35c06ab4 Mon Sep 17 00:00:00 2001
From: hius07 <62179190+hius07@users.noreply.github.com>
Date: Wed, 21 Aug 2024 20:53:45 +0300
Subject: [PATCH] Touch menu: always go up to correct parent page (#12378)

---
 frontend/apps/reader/modules/readerfooter.lua | 5 -----
 frontend/dispatcher.lua                       | 1 -
 frontend/ui/widget/touchmenu.lua              | 1 +
 plugins/gestures.koplugin/main.lua            | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua
index b90a53174..4dd67156a 100644
--- a/frontend/apps/reader/modules/readerfooter.lua
+++ b/frontend/apps/reader/modules/readerfooter.lua
@@ -1684,11 +1684,6 @@ With this feature enabled, the current page is factored in, resulting in the cou
             end,
         })
     end
-
-    -- Settings menu: keep the same parent page for going up from submenu
-    for i = 1, #configure_items_sub_table do
-        configure_items_sub_table[i].menu_item_id = i
-    end
 end
 
 -- settings menu item generators
diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua
index bacc08211..ea71d2f1d 100644
--- a/frontend/dispatcher.lua
+++ b/frontend/dispatcher.lua
@@ -902,7 +902,6 @@ function Dispatcher:_addItem(caller, menu, location, settings, section)
                         end
                     end,
                     separator = settingsList[k].separator,
-                    menu_item_id = k,
                 })
             end
         end
diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
index 2d6d8ddde..7f156ab8a 100644
--- a/frontend/ui/widget/touchmenu.lua
+++ b/frontend/ui/widget/touchmenu.lua
@@ -928,6 +928,7 @@ function TouchMenu:onMenuSelect(item, tap_on_checkmark)
             end
         else
             table.insert(self.item_table_stack, self.item_table)
+            item.menu_item_id = item.menu_item_id or tostring(item) -- unique id
             self.parent_id = item.menu_item_id
             self.item_table = sub_item_table
             self.page = 1
diff --git a/plugins/gestures.koplugin/main.lua b/plugins/gestures.koplugin/main.lua
index cebcee279..2ff375adb 100644
--- a/plugins/gestures.koplugin/main.lua
+++ b/plugins/gestures.koplugin/main.lua
@@ -310,7 +310,6 @@ function Gestures:genSubItem(ges, separator, hold_callback)
         sub_item_table_func = function() return self:genMenu(ges) end,
         separator = separator,
         hold_callback = hold_callback,
-        menu_item_id = ges,
         ignored_by_menu_search = true, -- This item is not strictly duplicated, but its subitems are.
                                        -- Ignoring it speeds up search.
     }