From 8ddca4bf49048c758a286bb33129f43b08c9469e Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 5 Nov 2014 12:15:07 +0800 Subject: [PATCH] close reader config panel when touching reader menu --- frontend/apps/reader/modules/readermenu.lua | 6 +++++- frontend/ui/widget/touchmenu.lua | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index bc1e3f285..ea499c083 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -208,7 +208,11 @@ function ReaderMenu:onShowReaderMenu() end main_menu.close_callback = function () - UIManager:close(menu_container) + self.ui:handleEvent(Event:new("CloseReaderMenu")) + end + + main_menu.touch_menu_callback = function () + self.ui:handleEvent(Event:new("CloseConfigMenu")) end menu_container[1] = main_menu diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index e68537277..501ccc557 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -465,6 +465,9 @@ function TouchMenu:netToggle() end function TouchMenu:switchMenuTab(tab_num) + if self.touch_menu_callback then + self.touch_menu_callback() + end if self.tab_item_table[tab_num].callback then self.tab_item_table[tab_num].callback() end @@ -516,6 +519,9 @@ function TouchMenu:onSwipe(arg, ges_ev) end function TouchMenu:onMenuSelect(item) + if self.touch_menu_callback then + self.touch_menu_callback() + end if item.tap_input then self:closeMenu() self:onMenuInput(item.tap_input) @@ -547,6 +553,9 @@ function TouchMenu:onMenuSelect(item) end function TouchMenu:onMenuHold(item) + if self.touch_menu_callback then + self.touch_menu_callback() + end if item.hold_input then self:closeMenu() self:onMenuInput(item.hold_input)