From 22c30439598fb96b5ae4a3a01fbabeaa24ff32d0 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 3 Feb 2013 03:35:25 +0800 Subject: [PATCH] add calling item.callback() as default onMenuChoice action --- frontend/ui/menu.lua | 8 ++++++-- frontend/ui/reader/readerfont.lua | 5 ----- frontend/ui/reader/readermenu.lua | 5 ----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/frontend/ui/menu.lua b/frontend/ui/menu.lua index 3c23623fe..becf9a51a 100644 --- a/frontend/ui/menu.lua +++ b/frontend/ui/menu.lua @@ -480,9 +480,13 @@ function Menu:onMenuSelect(item) end --[[ -override this function to handle the choice -]]-- + default to call item callback + override this function to handle the choice +--]] function Menu:onMenuChoice(item) + if item.callback then + item.callback() + end return true end diff --git a/frontend/ui/reader/readerfont.lua b/frontend/ui/reader/readerfont.lua index 33c6f5a3d..7443a2bcb 100644 --- a/frontend/ui/reader/readerfont.lua +++ b/frontend/ui/reader/readerfont.lua @@ -99,11 +99,6 @@ function ReaderFont:onShowFontMenu() item_table = self.face_table, width = Screen:getWidth() - 100, } - function main_menu:onMenuChoice(item) - if item.callback then - item.callback() - end - end -- build container local menu_container = CenterContainer:new{ main_menu, diff --git a/frontend/ui/reader/readermenu.lua b/frontend/ui/reader/readermenu.lua index 810fb4b0d..787af9163 100644 --- a/frontend/ui/reader/readermenu.lua +++ b/frontend/ui/reader/readermenu.lua @@ -73,11 +73,6 @@ function ReaderMenu:onShowMenu() item_table = self.item_table, width = Screen:getWidth() - 100, } - function main_menu:onMenuChoice(item) - if item.callback then - item.callback() - end - end local menu_container = CenterContainer:new{ ignore = "height",