From 607c4baf2e171003c9cb0b0a851f5ea94479e4a6 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 19 Mar 2013 21:36:11 +0800 Subject: [PATCH 1/2] add fine tuning of font size in koptinterface --- frontend/document/koptinterface.lua | 18 +++++++++++++++--- frontend/ui/reader/readerkopt.lua | 6 +++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index e868f441c..89634391f 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -101,13 +101,25 @@ KoptOptions = { options = { { name = "font_size", - item_text = {"Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa"}, + item_text = {"Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa","Aa"}, item_align_center = 1.0, spacing = 15, - item_font_size = {20,24,28,32,34,36,38,40,42,44,46}, - values = {0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 2.0, 4.0}, + item_font_size = {22,24,28,32,34,36,38,42,46,50}, + values = {0.1, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.6, 2.0, 4.0}, default_value = 1.0, + height = 60, }, + { + name = "font_fine_tune", + name_text = "Fine Tuning", + toggle = {"decrease","increase"}, + values = {-0.05, 0.05}, + default_value = 0.05, + event = "FineTuningFontSize", + args = {-0.05, 0.05}, + alternate = false, + height = 60, + } } }, { diff --git a/frontend/ui/reader/readerkopt.lua b/frontend/ui/reader/readerkopt.lua index d7269fb84..74582c762 100644 --- a/frontend/ui/reader/readerkopt.lua +++ b/frontend/ui/reader/readerkopt.lua @@ -36,4 +36,8 @@ end function ReaderKoptListener:onSetDimensions(dimensions) -- called later than reader zooming self.ui:handleEvent(Event:new("InitScrollPageStates")) -end \ No newline at end of file +end + +function ReaderKoptListener:onFineTuningFontSize(delta) + self.document.configurable.font_size = self.document.configurable.font_size + delta +end From b2c23c6f4f72f9b15900b4cb050d0073f99d3eb6 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 19 Mar 2013 21:57:30 +0800 Subject: [PATCH 2/2] cleanup: use lowercase option name && better reflow for vertical text --- frontend/document/koptinterface.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index 89634391f..d5a18c610 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -145,7 +145,7 @@ KoptOptions = { { name = "text_wrap", name_text = "Reflow", - toggle = {"On", "Off"}, + toggle = {"on", "off"}, values = {1, 0}, default_value = 0, events = { @@ -163,8 +163,8 @@ KoptOptions = { { name="screen_rotation", name_text = "Vertical Text", - toggle = {"Off", "On"}, - values = {0, 90}, + toggle = {"on", "off"}, + values = {270, 0}, default_value = 0, }, {