diff --git a/frontend/apps/reader/modules/readersearch.lua b/frontend/apps/reader/modules/readersearch.lua index 065178e98..9af4db8fe 100644 --- a/frontend/apps/reader/modules/readersearch.lua +++ b/frontend/apps/reader/modules/readersearch.lua @@ -661,6 +661,7 @@ function ReaderSearch:onShowFindAllResults(not_cached) item_table = self.findall_results, items_per_page = self.findall_results_per_page, items_max_lines = self.findall_results_max_lines, + multilines_forced = true, -- to always have search_string in bold covers_fullscreen = true, is_borderless = true, is_popout = false, @@ -718,7 +719,16 @@ function ReaderSearch:showAllResultsMenuDialog() local buttons = { { { - text = _("Filter by current chapter"), + text = _("All results"), + callback = function() + UIManager:close(button_dialog) + self:updateAllResultsMenu(self.findall_results) + end, + }, + }, + { + { + text = _("Results in current chapter"), callback = function() UIManager:close(button_dialog) local current_chapter = self.ui.toc:getTocTitleOfCurrentPage() @@ -737,6 +747,7 @@ function ReaderSearch:showAllResultsMenuDialog() end, }, }, + {}, -- separator { { text_func = function() diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua index 973574d8d..8d3cb08c4 100644 --- a/frontend/ui/widget/menu.lua +++ b/frontend/ui/widget/menu.lua @@ -91,6 +91,7 @@ local MenuItem = InputContainer:extend{ infont = "infont", linesize = Size.line.medium, single_line = false, + multilines_forced = false, -- set to true to always use TextBoxWidget multilines_show_more_text = false, -- Align text & mandatory baselines (only when single_line=true) align_baselines = false, @@ -139,7 +140,8 @@ function MenuItem:init() if self.infont_size > max_font_size then self.infont_size = max_font_size end - if not self.single_line and not self.multilines_show_more_text and not self.items_max_lines then + if not self.single_line and not self.multilines_forced + and not self.multilines_show_more_text and not self.items_max_lines then -- For non single line menus (File browser, Bookmarks), if the -- user provided font size is large and would not allow showing -- more than one line in our item height, just switch to single @@ -1106,6 +1108,7 @@ function Menu:updateItems(select_number, no_recalculate_dimen) menu = self, linesize = self.linesize, single_line = self.single_line, + multilines_forced = self.multilines_forced, multilines_show_more_text = multilines_show_more_text, items_max_lines = self.items_max_lines, truncate_left = self.truncate_left,