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 #192 from houqp/master

Browse Source 
build environment & bookmark navi bug fix
This commit is contained in:
Dobrica Pavlinušić
2012-06-07 03:33:30 -07:00
parent 454611afb7 2dfbf3177f
commit b46a4f5dbb
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -197,7 +197,7 @@ $(LUALIB):
ifdef EMULATE_READER
make -C $(LUADIR)
else
make -C $(LUADIR) HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2"
make -C $(LUADIR) CC="$(HOSTCC)" HOST_CC="$(HOSTCC) -m32" CROSS="$(HOST)-" TARGET_FLAGS="$(SYSROOT) -DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2"
endif
thirdparty: $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB) $(DJVULIBS) $(CRENGINELIBS)

12
crereader.lua
View File

@@ -287,14 +287,16 @@ end
function CREReader:prevBookMarkedPage()
local pre_item = nil
for k,v in ipairs(self.bookmarks) do
if self.pos <= self.doc:getPosFromXPointer(v) then
if self.doc:getPosFromXPointer(pre_item) < self.pos then
if self.pos <= self.doc:getPosFromXPointer(v.page) then
if not pre_item then
break
elseif self.doc:getPosFromXPointer(pre_item.page) < self.pos then
return pre_item
end
end
pre_item = v
end
return nil
return pre_item
end
function CREReader:showBookMarks()
@@ -407,8 +409,8 @@ function CREReader:adjustCreReaderCommands()
local delta = 1
local change = "increase"
if keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK then
delta = -1
change = "decrease"
delta = -1
change = "decrease"
end
self.font_zoom = self.font_zoom + delta
InfoMessage:show(change.." font size to "..self.font_zoom, 0)

8
unireader.lua
View File

@@ -1750,13 +1750,15 @@ function UniReader:prevBookMarkedPage()
local pre_item = nil
for k,v in ipairs(self.bookmarks) do
if self.pageno <= v.page then
if pre_item.page < self.pageno then
if not pre_item then
break
elseif pre_item.page < self.pageno then
return pre_item
end
end
pre_item = v
end
return nil
return pre_item
end
function UniReader:showHighLight()
@@ -1929,7 +1931,7 @@ function UniReader:addAllCommands()
function(unireader,keydef)
is_zoom_out = (keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK)
unireader:setGlobalZoom(unireader.globalzoom_orig
+ ( is_zoom_out and -1 or 1)*unireader.globalzoom_orig*0.2)
+ ( is_zoom_out and -1 or 1)*unireader.globalzoom_orig*0.2)
end)
self.commands:add(KEY_BACK,nil,"Back",
"go backward in jump history",