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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Michael Hall
2014-08-25 18:08:14 +01:00
parent 7ea90b2dc9 f2c2657cd9
commit d49153059d
10 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/ui/font.lua
View File

@@ -83,7 +83,8 @@ function Font:_readList(target, dir, effective_dir)
self:_readList(target, dir.."/"..f, effective_dir..f.."/")
else
local file_type = string.lower(string.match(f, ".+%.([^.]+)") or "")
if file_type == "ttf" or file_type == "cff" or file_type == "otf" then
if file_type == "ttf" or file_type == "ttc"
or file_type == "cff" or file_type == "otf" then
table.insert(target, effective_dir..f)
end
end

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

@@ -39,8 +39,9 @@ function FileChooser:genItemTableFromPath(path)
local files = {}
-- lfs.dir directory without permission will give error
if pcall(lfs.dir, self.path) then
for f in lfs.dir(self.path) do
local ok, iter, dir_obj = pcall(lfs.dir, self.path)
if ok then
for f in iter, dir_obj do
if self.show_hidden or not string.match(f, "^%.[^.]") then
local filename = self.path.."/"..f
local filemode = lfs.attributes(filename, "mode")

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

@@ -203,11 +203,6 @@ function VirtualKeyboard:init()
}
}
self:initLayout(self.layout)
if GLOBAL_INPUT_VALUE then
for i = 1, string.len(GLOBAL_INPUT_VALUE) do
self:addChar(string.sub(GLOBAL_INPUT_VALUE,i,i))
end
end
end
function VirtualKeyboard:initLayout(layout)