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

Merge pull request #1230 from chrox/fix_1170

Browse Source 
fix #1169 and #1170
This commit is contained in:
HW
2014-11-23 13:13:07 +01:00
parent 9fcf9f5a88 d11dba0558
commit 7b91935df0
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ local FileChooser = Menu:extend{
strcoll = strcoll,
collate = "strcoll", -- or collate = "access",
reverse_collate = false,
path_pages = {}, -- store last browsed location(page) for each path
}
function FileChooser:init()
@@ -148,8 +149,14 @@ function FileChooser:genItemTableFromPath(path)
return item_table
end
function FileChooser:updateItems(select_number)
Menu.updateItems(self, select_number) -- call parent's updateItems()
self.path_pages[self.path] = self.page
end
function FileChooser:refreshPath()
self:swithItemTable(nil, self:genItemTableFromPath(self.path))
self.page = self.path_pages[self.path] or 1
self:swithItemTable(nil, self:genItemTableFromPath(self.path), -1)
end
function FileChooser:changeToPath(path)

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

@@ -675,6 +675,12 @@ function Menu:swithItemTable(new_title, new_item_table, itemnumber)
self.page = math.ceil(itemnumber / self.perpage)
end
-- make sure current page is in right page range
local max_pages = math.ceil(#new_item_table / self.perpage)
if self.page > max_pages then
self.page = max_pages
end
self.item_table = new_item_table
self:updateItems(1)
end