From 9ea2b3dbad50a86df96c2e5c4cdeac029b22f588 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 8 Oct 2017 12:27:53 +0200 Subject: [PATCH] Option to disable show bottom menu on top menu activation (#3316) --- frontend/apps/reader/modules/readermenu.lua | 8 ++++++-- frontend/ui/elements/menu_activate.lua | 13 +++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index 4f9176534..b74f06e6a 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -305,7 +305,9 @@ end function ReaderMenu:onSwipeShowMenu(ges) if self.activation_menu ~= "tap" and ges.direction == "south" then - self.ui:handleEvent(Event:new("ShowConfigMenu")) + if G_reader_settings:nilOrTrue("show_bottom_menu") then + self.ui:handleEvent(Event:new("ShowConfigMenu")) + end self.ui:handleEvent(Event:new("ShowReaderMenu")) return true end @@ -313,7 +315,9 @@ end function ReaderMenu:onTapShowMenu() if self.activation_menu ~= "swipe" then - self.ui:handleEvent(Event:new("ShowConfigMenu")) + if G_reader_settings:nilOrTrue("show_bottom_menu") then + self.ui:handleEvent(Event:new("ShowConfigMenu")) + end self.ui:handleEvent(Event:new("ShowReaderMenu")) return true end diff --git a/frontend/ui/elements/menu_activate.lua b/frontend/ui/elements/menu_activate.lua index 77d4d54b4..f4df40df3 100644 --- a/frontend/ui/elements/menu_activate.lua +++ b/frontend/ui/elements/menu_activate.lua @@ -4,7 +4,6 @@ local _ = require("gettext") local function activateMenu() return G_reader_settings:readSetting("activate_menu") end - return { text = _("Activate menu"), sub_item_table = { @@ -55,7 +54,17 @@ return { UIManager:show(InfoMessage:new{ text = _("This will take effect on next restart."), }) - end + end, + separator = true, + }, + { + text = _("Auto-show bottom menu"), + checked_func = function() + return G_reader_settings:nilOrTrue("show_bottom_menu") + end, + callback = function() + G_reader_settings:flipNilOrTrue("show_bottom_menu") + end, }, } }