diff --git a/crereader.lua b/crereader.lua index 69bfc1ec5..56afb136e 100644 --- a/crereader.lua +++ b/crereader.lua @@ -287,7 +287,6 @@ end function CREReader:prevBookMarkedPage() local pre_item = nil for k,v in ipairs(self.bookmarks) do - Debug(v) if self.pos <= self.doc:getPosFromXPointer(v.page) then if not pre_item then break @@ -405,15 +404,23 @@ function CREReader:adjustCreReaderCommands() self.commands:addGroup(MOD_SHIFT.."< >",{ Keydef:new(KEY_PGBCK,MOD_SHIFT),Keydef:new(KEY_PGFWD,MOD_SHIFT), Keydef:new(KEY_LPGBCK,MOD_SHIFT),Keydef:new(KEY_LPGFWD,MOD_SHIFT)}, - "jump between bookmarks", - function(unireader,keydef) - is_prev_bm = (keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK) - if is_prev_bm then - bm = self:prevBookMarkedPage() - else - bm = self:nextBookMarkedPage() + "increase/decrease font size", + function(self) + local delta = 1 + local change = "increase" + if keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK then + delta = -1 + change = "decrease" end - if bm then self:goto(bm.page, nil, "xpointer") end + self.font_zoom = self.font_zoom + delta + InfoMessage:show(change.." font size to "..self.font_zoom, 0) + -- NuPogodi, 15.05.12: storing old document height + self.old_doc_height = self.doc:getFullHeight() + -- end of changes (NuPogodi) + self.doc:zoomFont(delta) + self:redrawCurrentPage() + -- NuPogodi, 18.05.12: storing new height of document & refreshing TOC + self:fillToc() end ) self.commands:addGroup(MOD_ALT.."< >",{ diff --git a/unireader.lua b/unireader.lua index 06f106024..b041336cd 100644 --- a/unireader.lua +++ b/unireader.lua @@ -1927,15 +1927,11 @@ function UniReader:addAllCommands() self.commands:addGroup(MOD_SHIFT.."< >",{ Keydef:new(KEY_PGBCK,MOD_SHIFT),Keydef:new(KEY_PGFWD,MOD_SHIFT), Keydef:new(KEY_LPGBCK,MOD_SHIFT),Keydef:new(KEY_LPGFWD,MOD_SHIFT)}, - "jump between bookmarks", + "zoom out/in 20%", function(unireader,keydef) - is_prev_bm = (keydef.keycode == KEY_PGBCK or keydef.keycode == KEY_LPGBCK) - if is_prev_bm then - bm = self:prevBookMarkedPage() - else - bm = self:nextBookMarkedPage() - end - if bm then self:goto(bm.page) end + 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) end) self.commands:add(KEY_BACK,nil,"Back", "go backward in jump history",