From d7ae82ddde1bff1eead27ae2a03d33d4d517ffd3 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 12 Aug 2014 21:24:11 +0800 Subject: [PATCH 1/3] rebase crengine with sourceforge upstream And add lastCharMargin to eliminate truncation of synthetic italic glyphs. This should fix #767. And #742 should also be fixed. --- koreader-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koreader-base b/koreader-base index 1af2b87c2..e55751cc5 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit 1af2b87c2041a38ef2ca0f9d898150fa2855340b +Subproject commit e55751cc548d3ec5b95f36fd12c4ec50160086a7 From b86a086a83e1af91cdd430a534d33bc7f952edd6 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 12 Aug 2014 22:14:04 +0800 Subject: [PATCH 2/3] recalculate width in InboxChooser --- plugins/zsync.koplugin/main.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/zsync.koplugin/main.lua b/plugins/zsync.koplugin/main.lua index a31985e85..89ecdca75 100644 --- a/plugins/zsync.koplugin/main.lua +++ b/plugins/zsync.koplugin/main.lua @@ -246,9 +246,12 @@ function InboxChooser:init() path = root_path, show_parent = self.show_parent, show_hidden = show_hidden, + width = Screen:getWidth(), height = Screen:getHeight() - banner:getSize().h, is_popout = false, is_borderless = true, + -- FIXME: has_close_button has no effect on menu title + has_close_button = true, dir_filter = function(dirname) for _, pattern in ipairs(self.exclude_dirs) do if dirname:match(pattern) then return end From a21c322499862281bc7bd6f14aa2bc4787e6bd38 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 12 Aug 2014 22:26:59 +0800 Subject: [PATCH 3/3] add close button in InboxChooser --- plugins/zsync.koplugin/main.lua | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/plugins/zsync.koplugin/main.lua b/plugins/zsync.koplugin/main.lua index 89ecdca75..81bf705b2 100644 --- a/plugins/zsync.koplugin/main.lua +++ b/plugins/zsync.koplugin/main.lua @@ -230,14 +230,6 @@ local InboxChooser = InputContainer:new{ function InboxChooser:init() self.show_parent = self.show_parent or self - local banner = VerticalGroup:new{ - TextWidget:new{ - face = Font:getFace("tfont", 24), - text = _("Choose inbox"), - }, - VerticalSpan:new{ width = Screen:scaleByDPI(10) } - } - local g_show_hidden = G_reader_settings:readSetting("show_hidden") local show_hidden = g_show_hidden == nil and DSHOWHIDDENFILES or g_show_hidden local root_path = G_reader_settings:readSetting("lastdir") or lfs.currentdir() @@ -247,11 +239,11 @@ function InboxChooser:init() show_parent = self.show_parent, show_hidden = show_hidden, width = Screen:getWidth(), - height = Screen:getHeight() - banner:getSize().h, + height = Screen:getHeight(), is_popout = false, is_borderless = true, - -- FIXME: has_close_button has no effect on menu title - has_close_button = true, + title = _("Choose inbox"), + no_title = false, dir_filter = function(dirname) for _, pattern in ipairs(self.exclude_dirs) do if dirname:match(pattern) then return end @@ -296,10 +288,7 @@ function InboxChooser:init() padding = 0, bordersize = 0, background = 0, - VerticalGroup:new{ - banner, - file_chooser, - } + file_chooser, } end