From f7fb103abcaf6445a712fb36f559a2fc551d5461 Mon Sep 17 00:00:00 2001 From: frankyifei Date: Sat, 1 Aug 2015 19:14:40 +0930 Subject: [PATCH] loop menu pages when it reaches ends MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the following graph shows my idea. 1->2->3->4->5->6->7->8->9->10 └----------------------------------------┘ --- frontend/ui/widget/menu.lua | 4 ++++ frontend/ui/widget/touchmenu.lua | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua index e7b6cbe92..d84fb4081 100644 --- a/frontend/ui/widget/menu.lua +++ b/frontend/ui/widget/menu.lua @@ -805,6 +805,8 @@ function Menu:onNextPage() if end_position ~= self.selected.y then self:updateItems(end_position) end + self.page = 1 + self:updateItems(1) end return true end @@ -812,6 +814,8 @@ end function Menu:onPrevPage() if self.page > 1 then self.page = self.page - 1 + elseif self.page == 1 then + self.page =self.page_num end self:updateItems(1) return true diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index 136c8e910..65c4b49b8 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -511,16 +511,20 @@ end function TouchMenu:onNextPage() if self.page < self.page_num then self.page = self.page + 1 - self:updateItems() + elseif self.page == self.page_num then + self.page = 1 end + self:updateItems() return true end function TouchMenu:onPrevPage() if self.page > 1 then self.page = self.page - 1 - self:updateItems() + elseif self.page == 1 then + self.page = self.page_num end + self:updateItems() return true end