From 0d902a1a4c52831f71308aea3b89029fb4c0a156 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Wed, 3 Jul 2013 02:19:10 -0400 Subject: [PATCH 1/2] add scrollmode and fullscreen mode to defaults --- defaults.lua | 6 ++++++ frontend/ui/data/koptoptions.lua | 4 ++-- frontend/ui/reader/readerview.lua | 2 +- frontend/ui/reader/readerzooming.lua | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/defaults.lua b/defaults.lua index ad480da93..5e6892a52 100644 --- a/defaults.lua +++ b/defaults.lua @@ -2,6 +2,12 @@ -- default to full refresh on every page turn DRCOUNTMAX = 6 +-- full screen mode, 1 for true, 0 for false +DFULL_SCREEN = 1 + +-- scroll mode, 1 for true, 0 for false +DSCROLL_MODE = 1 + -- default gamma setting: DGLOBALGAMMA = 1.0 diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua index da4eaa0fb..7e723000c 100644 --- a/frontend/ui/data/koptoptions.lua +++ b/frontend/ui/data/koptoptions.lua @@ -40,7 +40,7 @@ KoptOptions = { name_text = FULL_SCREEN_STR, toggle = {ON_STR, OFF_STR}, values = {1, 0}, - default_value = 0, + default_value = DFULL_SCREEN, event = "SetFullScreen", args = {true, false}, }, @@ -49,7 +49,7 @@ KoptOptions = { name_text = SCROLL_MODE_STR, toggle = {ON_STR, OFF_STR}, values = {1, 0}, - default_value = 0, + default_value = DSCROLL_MODE, event = "ToggleScrollMode", args = {true, false}, }, diff --git a/frontend/ui/reader/readerview.lua b/frontend/ui/reader/readerview.lua index 7358df8af..ecc6512e4 100644 --- a/frontend/ui/reader/readerview.lua +++ b/frontend/ui/reader/readerview.lua @@ -48,7 +48,7 @@ ReaderView = OverlapGroup:new{ -- dimen for area to dim dim_area = Geom:new{w = 0, h = 0}, -- has footer - footer_visible = false, + footer_visible = nil, -- has dogear dogear_visible = false, -- in flipping state diff --git a/frontend/ui/reader/readerzooming.lua b/frontend/ui/reader/readerzooming.lua index bf9b08c2c..1182a743a 100644 --- a/frontend/ui/reader/readerzooming.lua +++ b/frontend/ui/reader/readerzooming.lua @@ -226,8 +226,8 @@ end function ReaderZooming:genSetZoomModeCallBack(mode) return function() - -- toggle scroll mode on when zooming to content* and toggle scrool mode - -- off when zooming to page*. + -- toggle scroll mode on when zooming to content* and toggle scrool + -- mode off when zooming to page*. self.ui:handleEvent(Event:new("ToggleScrollMode", mode:find("content"))) self:setZoomMode(mode) end From 5b8996dfcc5bfa46658ad1b2455296b528812b11 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sat, 6 Jul 2013 02:58:25 -0400 Subject: [PATCH 2/2] turn off scroll mode be default --- defaults.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.lua b/defaults.lua index 5e6892a52..41f5b40bd 100644 --- a/defaults.lua +++ b/defaults.lua @@ -6,7 +6,7 @@ DRCOUNTMAX = 6 DFULL_SCREEN = 1 -- scroll mode, 1 for true, 0 for false -DSCROLL_MODE = 1 +DSCROLL_MODE = 0 -- default gamma setting: DGLOBALGAMMA = 1.0