renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: reset current page on item_table switch for menu widget

Browse Source
This commit is contained in:
Qingping Hou
2013-08-22 12:01:00 +08:00
parent cad8ddec92
commit c951eacc35
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/ui/widget/filechooser.lua
View File

@@ -11,7 +11,7 @@ FileChooser = Menu:extend{
}
function FileChooser:init()
self:updateItemTableFromPath(self.path)
self.item_table = self:genItemTableFromPath(self.path)
Menu.init(self) -- call parent's init()
end
@@ -29,11 +29,9 @@ function FileChooser:compressPath(item_path)
return path
end
function FileChooser:updateItemTableFromPath(path)
path = self:compressPath(path)
function FileChooser:genItemTableFromPath(path)
local dirs = {}
local files = {}
self.path = path
for f in lfs.dir(self.path) do
if self.show_hidden or not string.match(f, "^%.[^.]") then
@@ -51,21 +49,24 @@ function FileChooser:updateItemTableFromPath(path)
end
end
table.sort(dirs)
if self.path ~= "/" then table.insert(dirs, 1, "..") end
if path ~= "/" then table.insert(dirs, 1, "..") end
table.sort(files)
self.item_table = {}
local item_table = {}
for _, dir in ipairs(dirs) do
table.insert(self.item_table, { text = dir.."/", path = self.path.."/"..dir })
table.insert(item_table, { text = dir.."/", path = self.path.."/"..dir })
end
for _, file in ipairs(files) do
table.insert(self.item_table, { text = file, path = self.path.."/"..file })
table.insert(item_table, { text = file, path = self.path.."/"..file })
end
return item_table
end
function FileChooser:changeToPath(path)
self:updateItemTableFromPath(path)
self:updateItems(1)
path = self:compressPath(path)
self.path = path
self:swithItemTable(nil, self:genItemTableFromPath(path))
end
function FileChooser:onMenuSelect(item)

5
frontend/ui/widget/menu.lua
View File

@@ -477,7 +477,10 @@ function Menu:updateItems(select_number)
end
function Menu:swithItemTable(new_title, new_item_table)
self.menu_title.text = new_title
if self.menu_title then
self.menu_title.text = new_title
end
self.page = 1
self.item_table = new_item_table
self:updateItems(1)
end