From 90971a7bf7ac826f238d5969db038457f15e580a Mon Sep 17 00:00:00 2001 From: Tigran Aivazian Date: Fri, 28 Sep 2012 12:09:02 +0100 Subject: [PATCH 1/2] Fix from NuPogodi --- initialize scfont face properly. This fixes the bug of non-persistency of user's setting of scfont. --- selectmenu.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selectmenu.lua b/selectmenu.lua index 9abbb47ca..a7e1e5cea 100644 --- a/selectmenu.lua +++ b/selectmenu.lua @@ -12,7 +12,6 @@ SelectMenu = { -- font for paging display ffsize = 16, -- font for item shortcut - sface = Font:getFace("scfont", 22), -- title height title_H = 40, @@ -287,6 +286,7 @@ function SelectMenu:choose(ypos, height) local cface = Font:getFace("cfont", 22) local tface = Font:getFace("tfont", 25) local fface = Font:getFace("ffont", 16) + local sface = Font:getFace("scfont", 22) local lx = self.margin_H + 40 local fw = fb.bb:getWidth() - lx - self.margin_H @@ -326,7 +326,7 @@ function SelectMenu:choose(ypos, height) renderUtf8Text(fb.bb, self.margin_H + 3, y, fface, self.item_shortcuts[c], true) else - renderUtf8Text(fb.bb, self.margin_H + 8, y, self.sface, + renderUtf8Text(fb.bb, self.margin_H + 8, y, sface, self.item_shortcuts[c], true) end From f3b52f269cfe8ea16f3f4c7570aecc4fa5666725 Mon Sep 17 00:00:00 2001 From: Tigran Aivazian Date: Fri, 28 Sep 2012 12:49:36 +0100 Subject: [PATCH 2/2] Tidy up "git status" output a bit. Added settings.reader.lua, cr3cache, history, crash.log, .vimrc, data, fonts to .gitignore. --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 81a4bd850..7dbe43999 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,15 @@ lua lua-* .reader.kpdfview.lua +settings.reader.lua mupdf-thirdparty.zip djvulibre* +cr3cache +history +crash.log +.vimrc +data +fonts kpdfview *.o