Merge pull request #135 from chrox/master

several tweaks on scroll mode behavior

frontend/ui/data/koptoptions.lua

@@ -49,7 +49,7 @@ KoptOptions = {
 				name_text = SCROLL_MODE_STR,
 				toggle = {ON_STR, OFF_STR},
 				values = {1, 0},
-				default_value = 1,
+				default_value = 0,
 				event = "ToggleScrollMode",
 				args = {true, false},
 			},

frontend/ui/reader/readerflip.lua

@@ -15,9 +15,12 @@ end
 function ReaderFlipping:onSetFlippingMode(flipping_mode)
 	if flipping_mode then
 		self.orig_reflow_mode = self.view.document.configurable.text_wrap
+		self.orig_scroll_mode = self.view.page_scroll
 		self.view.document.configurable.text_wrap = 0
+		self.view.page_scroll = false
 	else
 		self.view.document.configurable.text_wrap = self.orig_reflow_mode
+		self.view.page_scroll = self.orig_scroll_mode
 	end
 	return true
 end

frontend/ui/reader/readerzooming.lua

@@ -96,22 +96,22 @@ end
 
 function ReaderZooming:onSpread(arg, ges)
 	if ges.direction == "horizontal" then
-		self:setZoomMode("contentwidth")
+		self:genSetZoomModeCallBack("contentwidth")()
 	elseif ges.direction == "vertical" then
-		self:setZoomMode("contentheight")
+		self:genSetZoomModeCallBack("contentheight")()
 	elseif ges.direction == "diagonal" then
-		self:setZoomMode("content")
+		self:genSetZoomModeCallBack("content")()
 	end
 	return true
 end
 
 function ReaderZooming:onPinch(arg, ges)
 	if ges.direction == "diagonal" then
-		self:setZoomMode("page")
+		self:genSetZoomModeCallBack("page")()
 	elseif ges.direction == "horizontal" then
-		self:setZoomMode("pagewidth")
+		self:genSetZoomModeCallBack("pagewidth")()
 	elseif ges.direction == "vertical" then
-		self:setZoomMode("pageheight")
+		self:genSetZoomModeCallBack("pageheight")()
 	end
 	return true
 end
@@ -226,6 +226,9 @@ end
 
 function ReaderZooming:genSetZoomModeCallBack(mode)
 	return function()
+		-- 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
 end