From 44c31afe62afaf99c2c3d5f71c02993e038633c6 Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 17 Aug 2013 15:34:42 +0800 Subject: [PATCH 1/3] fix bug #179 It seems that the setPageMargins method will mess up XPointer of current view. This bugfix simply disables page margin restoring in readercopt.lua so that reading position is restorable. --- frontend/ui/reader/readercopt.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/ui/reader/readercopt.lua b/frontend/ui/reader/readercopt.lua index 34be8a747..dbabb4d36 100644 --- a/frontend/ui/reader/readercopt.lua +++ b/frontend/ui/reader/readercopt.lua @@ -20,17 +20,20 @@ function ReaderCoptListener:onReadSettings(config) end) end - local copt_font_size = config:readSetting("copt_font_size") + local copt_font_size = config:readSetting("copt_font_size") or 22 if copt_font_size then table.insert(self.ui.postInitCallback, function() - self.ui:handleEvent(Event:new("SetFontSize", copt_font_size)) + self.ui.document:setFontSize(copt_font_size) + self.ui:handleEvent(Event:new("UpdatePos")) end) end local copt_margins = config:readSetting("copt_page_margins") if copt_margins then table.insert(self.ui.postInitCallback, function() - self.ui:handleEvent(Event:new("SetPageMargins", copt_margins)) + -- FIXME: SetPageMargins will mess up current reading position + -- for now we simply disable this feature. + --self.ui:handleEvent(Event:new("SetPageMargins", copt_margins)) end) end end From 6f89fec89140be96ca6979f83bbe82c0c90c19a1 Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 17 Aug 2013 16:11:46 +0800 Subject: [PATCH 2/3] fix calling setFontSize in pdfreader --- frontend/ui/reader/readercopt.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ui/reader/readercopt.lua b/frontend/ui/reader/readercopt.lua index dbabb4d36..79b0e53b5 100644 --- a/frontend/ui/reader/readercopt.lua +++ b/frontend/ui/reader/readercopt.lua @@ -20,7 +20,7 @@ function ReaderCoptListener:onReadSettings(config) end) end - local copt_font_size = config:readSetting("copt_font_size") or 22 + local copt_font_size = config:readSetting("copt_font_size") if copt_font_size then table.insert(self.ui.postInitCallback, function() self.ui.document:setFontSize(copt_font_size) From 0c17b6a1631c71da6b0b9191347eb190089b6360 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 18 Aug 2013 12:34:38 +0800 Subject: [PATCH 3/3] update koreader-base to fix bug #224 --- koreader-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koreader-base b/koreader-base index 15b4d4a59..dc497096c 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit 15b4d4a59c96afd5a6d0ec2f2b5cb5538628638c +Subproject commit dc497096c0d39e1d9298ffe368960c5b838d4524