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

Use checked_func instead of remembering the checked item.

Browse Source
This commit is contained in:
Andrey Golovizin
2014-11-15 16:23:27 +01:00
parent a3e51b339d
commit 50d9041c1d
2 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/apps/reader/modules/readerfont.lua
View File

@@ -20,17 +20,8 @@ local ReaderFont = InputContainer:new{
face_table = nil,
-- default gamma from crengine's lvfntman.cpp
gamma_index = nil,
cur_face_idx = nil,
}
function ReaderFont:_changeSel(k)
if self.cur_face_idx then
self.face_table[self.cur_face_idx].checked = false
end
self.face_table[k].checked = true
self.cur_face_idx = k
end
function ReaderFont:init()
if Device:hasKeyboard() then
-- add shortcut for keyboard
@@ -58,18 +49,17 @@ function ReaderFont:init()
self.face_table = {}
local face_list = cre.getFontFaces()
for k,v in ipairs(face_list) do
if v == self.font_face then
self.cur_face_idx = k
end
table.insert(self.face_table, {
text = v,
callback = function()
self:_changeSel(k)
self:setFont(v)
end,
hold_callback = function()
self:makeDefault(v)
end,
checked_func = function()
return v == self.font_face
end
})
face_list[k] = {text = v}
end
@@ -114,12 +104,6 @@ function ReaderFont:onReadSettings(config)
table.insert(self.ui.postInitCallback, function()
self.ui:handleEvent(Event:new("UpdatePos"))
end)
for k,v in ipairs(self.face_table) do
if v.text == self.font_face then
self:_changeSel(k)
end
end
end
function ReaderFont:onShowFontMenu()