From 3275413366224f7d348e09cc12a955fedeb72cbe Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 16 Jan 2014 12:54:49 +0800 Subject: [PATCH 1/5] add missing registry for fb2 document --- frontend/document/credocument.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua index 688bcd10e..f7173c1f9 100644 --- a/frontend/document/credocument.lua +++ b/frontend/document/credocument.lua @@ -324,6 +324,7 @@ end function CreDocument:register(registry) registry:addProvider("txt", "application/txt", self) registry:addProvider("epub", "application/epub", self) + registry:addProvider("fb2", "application/fb2", self) registry:addProvider("html", "application/html", self) registry:addProvider("htm", "application/htm", self) registry:addProvider("zip", "application/zip", self) From f5ddf33cabe7814a259568b57c69b29822b6afb8 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 16 Jan 2014 13:43:45 +0800 Subject: [PATCH 2/5] fix missing Device in readerscreenshot --- frontend/ui/reader/readerscreenshot.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/ui/reader/readerscreenshot.lua b/frontend/ui/reader/readerscreenshot.lua index 963a09b73..e2f2db553 100644 --- a/frontend/ui/reader/readerscreenshot.lua +++ b/frontend/ui/reader/readerscreenshot.lua @@ -1,4 +1,5 @@ local InputContainer = require("ui/widget/container/inputcontainer") +local Device = require("ui/device") local Screen = require("ui/screen") local GestureRange = require("ui/gesturerange") local UIManager = require("ui/uimanager") From 4454df705a23eb327380b008f52d114e40f5f776 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 16 Jan 2014 17:24:23 +0800 Subject: [PATCH 3/5] enlarge tappable link box --- frontend/ui/reader/readerlink.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/ui/reader/readerlink.lua b/frontend/ui/reader/readerlink.lua index 9e135fed3..9b6701680 100644 --- a/frontend/ui/reader/readerlink.lua +++ b/frontend/ui/reader/readerlink.lua @@ -53,10 +53,14 @@ function ReaderLink:onTap(arg, ges) local pos = self.view:screenToPageTransform(ges.pos) for i = 1, #self.view.links do local link = self.view.links[i] + -- enlarge tappable link box local lbox = Geom:new{ - x = link.start_x, y = link.start_y, - w = link.end_x - link.start_x, - h = link.end_y - link.start_y > 0 and link.end_y - link.start_y or 30, + x = link.start_x - Screen:scaleByDPI(15), + y = link.start_y - Screen:scaleByDPI(15), + w = link.end_x - link.start_x + Screen:scaleByDPI(30), + h = link.end_y - link.start_y > 0 + and link.end_y - link.start_y + Screen:scaleByDPI(30) + or Screen:scaleByDPI(50), } if inside_box(pos, lbox) then DEBUG("goto link", link) From 3900657c7389f975991054db9303f4a119a313ad Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 16 Jan 2014 18:30:30 +0800 Subject: [PATCH 4/5] should lookup dictionary for Chinese word now --- koreader-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koreader-base b/koreader-base index d73713f8b..6284768bc 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit d73713f8b88acf02c6eb6057363e7a42586862a5 +Subproject commit 6284768bc3e317385164e9955837ac75265ffd1d From 63ddc3dd047b525b54956ee5b8bc1f64802e084f Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 16 Jan 2014 18:32:09 +0800 Subject: [PATCH 5/5] tweaks on default page margins --- defaults.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults.lua b/defaults.lua index 4a0ffd962..85feb4ad1 100644 --- a/defaults.lua +++ b/defaults.lua @@ -88,8 +88,8 @@ DCREREADER_CONFIG_DEFAULT_FONT_SIZE = 22 -- default font size -- crereader margin sizes -- margin {left, top, right, bottom} in pixels DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {5, 10, 5, 10} -DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {20, 15, 20, 15} -DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {25, 20, 25, 20} +DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {10, 15, 10, 15} +DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {20, 20, 20, 20} -- gesture detector defaults DGESDETECT_DISABLE_DOUBLE_TAP = true