Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-10 01:10:34 +00:00
Code Issues Projects Releases Wiki Activity

move adjustGesCoordinate from Screen to GestureDetector

Browse Source 
also adjust swipe direction according to screen view mode
This commit is contained in:
Qingping Hou 2013-02-19 11:13:24 +08:00
parent ab956a10c5
commit a655219eba
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/ui/gesturedetector.lua
View File

@ -326,4 +326,29 @@ function GestureDetector:holdState(tev)
end
end
--[[
@brief change gesture's x and y coordinates according to screen view mode
@param ges gesture that you want to adjust
@return adjusted gesture.
--]]
function GestureDetector:adjustGesCoordinate(ges)
if Screen.cur_rotation_mode == 1 then
-- in landscape mode
ges.pos.x, ges.pos.y = (Screen.width - ges.pos.y), (ges.pos.x)
if ges.ges == "swipe" then
if ges.direction == "down" then
ges.direction = "left"
elseif ges.direction == "up" then
ges.direction = "right"
elseif ges.direction == "right" then
ges.direction = "down"
elseif ges.direction == "left" then
ges.direction = "up"
end
end
end
return ges
end

4
frontend/ui/inputevent.lua
View File

@ -407,7 +407,7 @@ function Input:handleTouchEv(ev)
--self.cur_ev = {}
if touch_ges then
return Event:new("Gesture",
Screen:adjustGesCoordinate(touch_ges)
GestureDetector:adjustGesCoordinate(touch_ges)
)
end
end
@ -448,7 +448,7 @@ function Input:waitEvent(timeout_us, timeout_s)
-- decided a gesture? FIXME
Input.timer_callbacks = {}
return Event:new("Gesture",
Screen:adjustGesCoordinate(touch_ges)
GestureDetector:adjustGesCoordinate(touch_ges)
)
end -- EOF if touch_ges
end -- EOF if deadline reached

15
frontend/ui/screen.lua
View File

@ -148,21 +148,6 @@ function Screen:setScreenMode(mode)
end
end
--[[
@brief change gesture's x and y coordinates according to screen view mode
@param ges gesture that you want to adjust
@return adjusted gesture.
--]]
function Screen:adjustGesCoordinate(ges)
if self.cur_rotation_mode == 1 then
--@TODO fix wipe direction 03.02 2013 (houqp)
ges.pos.x, ges.pos.y = (self.width - ges.pos.y), (ges.pos.x)
end
return ges
end
function Screen:saveCurrentBB()
local width, height = self:getWidth(), self:getHeight()