Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: reflowed page should be at the top of the screen

Browse Source 
when reflowed page has a height less than screen height. This bug was
initially found by @tigran123 in #452. I'm sorry that I didn't fix it
until now.
This commit is contained in:
chrox 2012-11-12 02:49:27 +08:00
parent f4eb9e7982
commit 6df1a05264
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
koptreader.lua
View File

@ -230,7 +230,7 @@ function KOPTReader:drawOrCache(no, preCache)
end end
local kc = self:getContext(page, no, preCache) local kc = self:getContext(page, no, preCache)
self.globalzoom_mode = self.ZOOM_FIT_TO_CONTENT_WIDTH_PAN
-- check if we have relevant cache contents -- check if we have relevant cache contents
local bbox = self.cur_bbox local bbox = self.cur_bbox
local pagehash = no..self.configurable:hash('_')..'_'..bbox.x0..'_'..bbox.y0..'_'..bbox.x1..'_'..bbox.y1 local pagehash = no..self.configurable:hash('_')..'_'..bbox.x0..'_'..bbox.y0..'_'..bbox.x1..'_'..bbox.y1
@ -250,11 +250,7 @@ function KOPTReader:drawOrCache(no, preCache)
self.min_offset_y = 0 self.min_offset_y = 0
end end
if self.offset_x < self.min_offset_x then if self.offset_y == -2012534 then
self.offset_x = self.min_offset_x
end
if self.offset_y < self.min_offset_y then
self.offset_y = self.min_offset_y self.offset_y = self.min_offset_y
end end
@ -330,12 +326,8 @@ function KOPTReader:drawOrCache(no, preCache)
if(self.min_offset_y > 0) then if(self.min_offset_y > 0) then
self.min_offset_y = 0 self.min_offset_y = 0
end end
if self.offset_x < self.min_offset_x then if self.offset_y == -2012534 then
self.offset_x = self.min_offset_x
end
if self.offset_y < self.min_offset_y then
self.offset_y = self.min_offset_y self.offset_y = self.min_offset_y
end end
@ -437,8 +429,7 @@ function KOPTReader:nextView()
pageno = pageno + 1 pageno = pageno + 1
else else
-- goto next view of current page -- goto next view of current page
local offset_y_dec = self.offset_y - G_height + self.pan_overlap_vertical self.offset_y = self.offset_y - G_height + self.pan_overlap_vertical
self.offset_y = offset_y_dec > self.min_offset_y and offset_y_dec or self.min_offset_y
end end
return pageno return pageno
@ -457,8 +448,7 @@ function KOPTReader:prevView()
pageno = pageno - 1 pageno = pageno - 1
else else
-- goto previous view of current page -- goto previous view of current page
local offset_y_inc = self.offset_y + G_height - self.pan_overlap_vertical self.offset_y = self.offset_y + G_height - self.pan_overlap_vertical
self.offset_y = offset_y_inc < 0 and offset_y_inc or 0
end end
return pageno return pageno
@ -481,12 +471,16 @@ function KOPTReader:loadSettings(filename)
--Debug("default configurable:", dump(self.configurable)) --Debug("default configurable:", dump(self.configurable))
self.configurable:loadSettings(self.settings, 'kopt_') self.configurable:loadSettings(self.settings, 'kopt_')
--Debug("loaded configurable:", dump(self.configurable)) --Debug("loaded configurable:", dump(self.configurable))
-- backup global variable that may be changed in koptreader
self.orig_globalzoom_mode = self.settings:readSetting("globalzoom_mode") or -1
end end
function KOPTReader:saveSpecialSettings() function KOPTReader:saveSpecialSettings()
self.settings:saveSetting("kopt_offset_y", self.offset_y) self.settings:saveSetting("kopt_offset_y", self.offset_y)
self.configurable:saveSettings(self.settings, 'kopt_') self.configurable:saveSettings(self.settings, 'kopt_')
--Debug("saved configurable:", dump(self.configurable)) --Debug("saved configurable:", dump(self.configurable))
-- restore global variable from backups
self.settings:saveSetting("globalzoom_mode", self.orig_globalzoom_mode)
end end
function KOPTReader:init() function KOPTReader:init()