From ac092133197b7164ae07844a20ea8474e74efa03 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 26 Apr 2012 14:05:51 +0200 Subject: [PATCH 1/3] show Redrawing with InfoMessage on font change --- crereader.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crereader.lua b/crereader.lua index 458095732..336970d0b 100644 --- a/crereader.lua +++ b/crereader.lua @@ -373,12 +373,12 @@ function CREReader:adjustCreReaderCommands() local item_no = fonts_menu:choose(0, G_height) debug(face_list[item_no]) + Screen:restoreFromSavedBB() if item_no then self.doc:setFontFace(face_list[item_no]) self.font_face = face_list[item_no] InfoMessage:show("Redrawing with "..face_list[item_no], 0) end - Screen:restoreFromSavedBB() self:redrawCurrentPage() end ) From 17a590cf5ae91f771dd2653a1ccce578651c1724 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 26 Apr 2012 14:09:09 +0200 Subject: [PATCH 2/3] show increase/decrease font size InfoMessage --- crereader.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crereader.lua b/crereader.lua index 336970d0b..4ea3a0990 100644 --- a/crereader.lua +++ b/crereader.lua @@ -317,9 +317,12 @@ function CREReader:adjustCreReaderCommands() "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 + InfoMessage:show(change.." font size", 0) self.doc:zoomFont(delta) self:redrawCurrentPage() end From 5492025a38d3ebedb24716959f581b9b2695c7c3 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 26 Apr 2012 14:13:32 +0200 Subject: [PATCH 3/3] pan_margin is really in screen pixels I don't know what I was thinking when implementing this code. If I modify it with global zoom, it keeps moving, as we zoom in on multiple key presses --- unireader.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/unireader.lua b/unireader.lua index 81cef0f3f..80f2d25eb 100644 --- a/unireader.lua +++ b/unireader.lua @@ -54,7 +54,7 @@ UniReader = { pan_by_page = false, -- using shift_[xy] or width/height pan_x = 0, -- top-left offset of page when pan activated pan_y = 0, - pan_margin = 20, -- horizontal margin for two-column zoom + pan_margin = 5, -- horizontal margin for two-column zoom (in pixels) pan_overlap_vertical = 30, show_overlap = 0, @@ -1260,13 +1260,11 @@ function UniReader:setzoom(page, preCache) or self.globalzoom_mode == self.ZOOM_FIT_TO_CONTENT_HALF_WIDTH_MARGIN then local margin = self.pan_margin if self.globalzoom_mode == self.ZOOM_FIT_TO_CONTENT_HALF_WIDTH then margin = 0 end - local pg_margin = 0 -- margin scaled to page size - if margin > 0 then pg_margin = margin * 2 / self.globalzoom end - self.globalzoom = width / (x1 - x0 + pg_margin) + self.globalzoom = width / (x1 - x0 + margin) self.offset_x = -1 * x0 * self.globalzoom * 2 + margin - self.globalzoom = height / (y1 - y0 + pg_margin) + self.globalzoom = height / (y1 - y0 + margin) self.offset_y = -1 * y0 * self.globalzoom * 2 + margin - self.globalzoom = width / (x1 - x0 + pg_margin) * 2 + self.globalzoom = width / (x1 - x0 + margin) * 2 debug("column mode offset:", self.offset_x, self.offset_y, " zoom:", self.globalzoom); self.globalzoom_mode = self.ZOOM_BY_VALUE -- enable pan mode self.pan_x = self.offset_x