averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-18 12:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 'read from right to left' in readerrolling

Browse Source 
- Fix problems in readerpaging.lua;
- Add the same feature in readerrolling.lua.
This commit is contained in:
chihyang
2016-06-10 21:17:42 +08:00
parent 8b14209249
commit a948ecb19a
2 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/apps/reader/modules/readerpaging.lua
View File

@@ -131,6 +131,7 @@ function ReaderPaging:onReadSettings(config)
self.flipping_zoom_mode = config:readSetting("flipping_zoom_mode") or "page"
self.flipping_scroll_mode = config:readSetting("flipping_scroll_mode") or false
self.inverse_reading_order = config:readSetting("inverse_reading_order") or false
self:updateReadOrder()
end
function ReaderPaging:onSaveSettings()
@@ -859,9 +860,9 @@ function ReaderPaging:updateReadOrder()
y = Screen:getHeight()*DTAP_ZONE_FORWARD.y,
w = Screen:getWidth()*DTAP_ZONE_FORWARD.w,
h = Screen:getHeight()*DTAP_ZONE_FORWARD.h,
},
}
}
},
}
self.ges_events.TapBackward = {
GestureRange:new{
ges = "tap",
@@ -870,9 +871,9 @@ function ReaderPaging:updateReadOrder()
y = Screen:getHeight()*DTAP_ZONE_BACKWARD.y,
w = Screen:getWidth()*DTAP_ZONE_BACKWARD.w,
h = Screen:getHeight()*DTAP_ZONE_BACKWARD.h,
},
}
}
},
}
else
self.ges_events.TapForward = {
GestureRange:new{

73
frontend/apps/reader/modules/readerrolling.lua
View File

@@ -34,6 +34,7 @@ local ReaderRolling = InputContainer:new{
old_doc_height = nil,
old_page = nil,
current_pos = 0,
inverse_reading_order = false,
-- only used for page view mode
current_page= nil,
doc_height = nil,
@@ -97,7 +98,7 @@ function ReaderRolling:init()
self.ui.menu:registerToMainMenu(self)
end
-- This method will be called in onSetDimensions handler
-- This method will be called in onSetDimensions handler
function ReaderRolling:initGesListener()
self.ges_events = {
TapForward = {
@@ -166,6 +167,7 @@ function ReaderRolling:initGesListener()
}
},
}
self:updateReadOrder()
end
function ReaderRolling:onReadSettings(config)
@@ -207,6 +209,8 @@ function ReaderRolling:onReadSettings(config)
if self.show_overlap_enable == nil then
self.show_overlap_enable = DSHOWOVERLAP
end
self.inverse_reading_order = config:readSetting("inverse_reading_order") or false
self:updateReadOrder()
end
function ReaderRolling:onSaveSettings()
@@ -215,6 +219,7 @@ function ReaderRolling:onSaveSettings()
self.ui.doc_settings:saveSetting("last_xpointer", self.xpointer)
self.ui.doc_settings:saveSetting("percent_finished", self:getLastPercent())
self.ui.doc_settings:saveSetting("show_overlap_enable", self.show_overlap_enable)
self.ui.doc_settings:saveSetting("inverse_reading_order", self.inverse_reading_order)
end
function ReaderRolling:getLastProgress()
@@ -269,10 +274,22 @@ function ReaderRolling:onTapBackward()
end
function ReaderRolling:onSwipe(arg, ges)
if ges.direction == "west" or ges.direction == "north" then
if ges.direction == "north" then
self:onGotoViewRel(1)
elseif ges.direction == "east" or ges.direction == "south" then
elseif ges.direction == "south" then
self:onGotoViewRel(-1)
elseif ges.direction == "west" then
if self.inverse_reading_order then
self:onPagingRel(-1)
else
self:onPagingRel(1)
end
elseif ges.direction == "east" then
if self.inverse_reading_order then
self:onPagingRel(1)
else
self:onPagingRel(-1)
end
end
end
@@ -525,4 +542,54 @@ function ReaderRolling:updateBatteryState()
end
end
function ReaderRolling:updateReadOrder()
if self.inverse_reading_order then
self.ges_events.TapForward = {
GestureRange:new{
ges = "tap",
range = Geom:new{
x = Screen:getWidth()*(1-DTAP_ZONE_FORWARD.x-DTAP_ZONE_FORWARD.w),
y = Screen:getHeight()*DTAP_ZONE_FORWARD.y,
w = Screen:getWidth()*DTAP_ZONE_FORWARD.w,
h = Screen:getHeight()*DTAP_ZONE_FORWARD.h,
}
}
}
self.ges_events.TapBackward = {
GestureRange:new{
ges = "tap",
range = Geom:new{
x = Screen:getWidth()*(1-DTAP_ZONE_BACKWARD.x-DTAP_ZONE_BACKWARD.w),
y = Screen:getHeight()*DTAP_ZONE_BACKWARD.y,
w = Screen:getWidth()*DTAP_ZONE_BACKWARD.w,
h = Screen:getHeight()*DTAP_ZONE_BACKWARD.h,
}
}
}
else
self.ges_events.TapForward = {
GestureRange:new{
ges = "tap",
range = Geom:new{
x = Screen:getWidth()*DTAP_ZONE_FORWARD.x,
y = Screen:getHeight()*DTAP_ZONE_FORWARD.y,
w = Screen:getWidth()*DTAP_ZONE_FORWARD.w,
h = Screen:getHeight()*DTAP_ZONE_FORWARD.h,
}
}
}
self.ges_events.TapBackward = {
GestureRange:new{
ges = "tap",
range = Geom:new{
x = Screen:getWidth()*DTAP_ZONE_BACKWARD.x,
y = Screen:getHeight()*DTAP_ZONE_BACKWARD.y,
w = Screen:getWidth()*DTAP_ZONE_BACKWARD.w,
h = Screen:getHeight()*DTAP_ZONE_BACKWARD.h,
}
}
}
end
end
return ReaderRolling