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

fixed menu info displaying, replaced debug() by DEBUG()

Browse Source 
the replacement of debug() was necessary to be able to access the lua library "debug" (for backtraces etc.)
This commit is contained in:
HW
2012-05-28 18:59:16 +02:00
parent 8191cbe852
commit 60ccd7441e
15 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/ui/rendertext.lua
View File

@@ -13,7 +13,7 @@ function getGlyph(face, charcode)
end
local rendered_glyph = face.ftface:renderGlyph(charcode)
if not rendered_glyph then
debug("error rendering glyph (charcode=", charcode, ") for face", face)
DEBUG("error rendering glyph (charcode=", charcode, ") for face", face)
return
end
glyph = CacheItem:new{rendered_glyph}
@@ -48,7 +48,7 @@ end
function sizeUtf8Text(x, width, face, text, kerning)
if text == nil then
debug("sizeUtf8Text called without text");
DEBUG("sizeUtf8Text called without text");
return
end
-- may still need more adaptive pen placement when kerning,
@@ -64,14 +64,14 @@ function sizeUtf8Text(x, width, face, text, kerning)
if kerning and prevcharcode then
local kern = face.ftface:getKerning(prevcharcode, charcode)
pen_x = pen_x + kern
--debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." kern:"..kern)
--DEBUG("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." kern:"..kern)
else
--debug("curr:"..string.char(charcode))
--DEBUG("curr:"..string.char(charcode))
end
pen_x = pen_x + glyph.ax
pen_y_top = math.max(pen_y_top, glyph.t)
pen_y_bottom = math.max(pen_y_bottom, glyph.bb:getHeight() - glyph.t)
--debug("ax:"..glyph.ax.." t:"..glyph.t.." r:"..glyph.r.." h:"..glyph.bb:getHeight().." w:"..glyph.bb:getWidth().." yt:"..pen_y_top.." yb:"..pen_y_bottom)
--DEBUG("ax:"..glyph.ax.." t:"..glyph.t.." r:"..glyph.r.." h:"..glyph.bb:getHeight().." w:"..glyph.bb:getWidth().." yt:"..pen_y_top.." yb:"..pen_y_bottom)
prevcharcode = charcode
end
end
@@ -80,7 +80,7 @@ end
function renderUtf8Text(buffer, x, y, face, text, kerning)
if text == nil then
debug("renderUtf8Text called without text");
DEBUG("renderUtf8Text called without text");
return 0
end
-- may still need more adaptive pen placement when kerning,
@@ -94,10 +94,10 @@ function renderUtf8Text(buffer, x, y, face, text, kerning)
if kerning and prevcharcode then
local kern = face.ftface:getKerning(prevcharcode, charcode)
pen_x = pen_x + kern
--debug("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." pen_x:"..pen_x.." kern:"..kern)
--DEBUG("prev:"..string.char(prevcharcode).." curr:"..string.char(charcode).." pen_x:"..pen_x.." kern:"..kern)
buffer:addblitFrom(glyph.bb, x + pen_x + glyph.l, y - glyph.t, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight())
else
--debug(" curr:"..string.char(charcode))
--DEBUG(" curr:"..string.char(charcode))
buffer:blitFrom(glyph.bb, x + pen_x + glyph.l, y - glyph.t, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight())
end
pen_x = pen_x + glyph.ax