Merge pull request #143 from houqp/houqp-master

add scrollmode and fullscreen mode to defaults
This commit is contained in:
Huang Xin
2013-07-06 21:22:46 -07:00
4 changed files with 11 additions and 5 deletions

View File

@@ -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 = 0
-- default gamma setting:
DGLOBALGAMMA = 1.0

View File

@@ -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},
},

View File

@@ -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

View File

@@ -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