mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Merge pull request #335 from tigran123/master
Fix from NuPogodi: initialize scfont face properly.
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -2,8 +2,15 @@
|
||||
lua
|
||||
lua-*
|
||||
.reader.kpdfview.lua
|
||||
settings.reader.lua
|
||||
mupdf-thirdparty.zip
|
||||
djvulibre*
|
||||
cr3cache
|
||||
history
|
||||
crash.log
|
||||
.vimrc
|
||||
data
|
||||
fonts
|
||||
kpdfview
|
||||
*.o
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ SelectMenu = {
|
||||
-- font for paging display
|
||||
ffsize = 16,
|
||||
-- font for item shortcut
|
||||
sface = Font:getFace("scfont", 22),
|
||||
|
||||
-- title height
|
||||
title_H = 40,
|
||||
@@ -287,6 +286,7 @@ function SelectMenu:choose(ypos, height)
|
||||
local cface = Font:getFace("cfont", 22)
|
||||
local tface = Font:getFace("tfont", 25)
|
||||
local fface = Font:getFace("ffont", 16)
|
||||
local sface = Font:getFace("scfont", 22)
|
||||
|
||||
local lx = self.margin_H + 40
|
||||
local fw = fb.bb:getWidth() - lx - self.margin_H
|
||||
@@ -326,7 +326,7 @@ function SelectMenu:choose(ypos, height)
|
||||
renderUtf8Text(fb.bb, self.margin_H + 3, y, fface,
|
||||
self.item_shortcuts[c], true)
|
||||
else
|
||||
renderUtf8Text(fb.bb, self.margin_H + 8, y, self.sface,
|
||||
renderUtf8Text(fb.bb, self.margin_H + 8, y, sface,
|
||||
self.item_shortcuts[c], true)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user