Add simple swipe component

This commit is contained in:
Insality 2020-04-17 20:04:45 +03:00
parent 14a70964c8
commit 3339b00071
8 changed files with 172 additions and 6 deletions

View File

@ -70,7 +70,7 @@ function M.set_hover(self, state)
end end
--- Strict button click area. Useful for --- Strict hover click area. Useful for
-- no click events outside stencil node -- no click events outside stencil node
-- @function hover:set_click_zone -- @function hover:set_click_zone
-- @tparam node zone Gui node -- @tparam node zone Gui node

129
druid/base/swipe.lua Normal file
View File

@ -0,0 +1,129 @@
--- Component to handle swipe gestures on node.
-- Swipe will be triggered, if swipe was started and
-- ended on one node
-- @module druid.swipe
--- Component events
-- @table Events
-- @tfield druid_event on_swipe Trigger on swipe event
--- Component style params
-- @table Style
-- @tfield number SWIPE_TIME Maximum time for swipe trigger
-- @tfield number SWIPE_THRESHOLD Minimum distance for swipe trigger
-- @tfield bool SWIPE_TRIGGER_ON_MOVE If true, trigger on swipe moving, not only release action
local Event = require("druid.event")
local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local M = component.create("swipe", { const.ON_INPUT })
local function start_swipe(self, action)
self._swipe_start_time = socket.gettime()
self.start_pos.x = action.x
self.start_pos.y = action.y
end
local function reset_swipe(self, action)
self._swipe_start_time = false
end
local function check_swipe(self, action)
local dx = action.x - self.start_pos.x
local dy = action.y - self.start_pos.y
local dist = helper.distance(self.start_pos.x, self.start_pos.y, action.x, action.y)
local delta_time = socket.gettime() - self._swipe_start_time
local is_swipe = self.style.SWIPE_THRESHOLD <= dist and delta_time <= self.style.SWIPE_TIME
if is_swipe then
local is_x_swipe = math.abs(dx) >= math.abs(dy)
local swipe_side = false
if is_x_swipe and dx > 0 then
swipe_side = const.SWIPE.RIGHT
end
if is_x_swipe and dx < 0 then
swipe_side = const.SWIPE.LEFT
end
if not is_x_swipe and dy > 0 then
swipe_side = const.SWIPE.UP
end
if not is_x_swipe and dy < 0 then
swipe_side = const.SWIPE.DOWN
end
self.on_swipe:trigger(self:get_context(), swipe_side, dist, delta_time)
reset_swipe(self)
end
end
--- Component init function
-- @function swipe:init
-- @tparam node node Gui node
-- @tparam function on_swipe_callback Swipe callback for on_swipe_end event
function M.init(self, node, on_swipe_callback)
self.style = self:get_style()
self._trigger_on_move = self.style.SWIPE_TRIGGER_ON_MOVE
self.node = self:get_node(node)
self._swipe_start_time = false
self.start_pos = vmath.vector3(0)
self.click_zone = nil
self.on_swipe = Event(on_swipe_callback)
end
function M.on_input(self, action_id, action)
if action_id ~= const.ACTION_TOUCH then
return
end
if not helper.is_enabled(self.node) then
return false
end
local is_pick = gui.pick_node(self.node, action.x, action.y)
if self.click_zone then
is_pick = is_pick and gui.pick_node(self.click_zone, action.x, action.y)
end
if not is_pick then
reset_swipe(self, action)
return false
end
if self._swipe_start_time and (self._trigger_on_move or action.released) then
check_swipe(self, action)
end
if action.pressed then
start_swipe(self, action)
end
if action.released then
reset_swipe(self, action)
end
end
function M.on_input_interrupt(self)
reset_swipe(self)
end
--- Strict swipe click area. Useful for
-- restrict events outside stencil node
-- @function swipe:set_click_zone
-- @tparam node zone Gui node
function M.set_click_zone(self, zone)
self.click_zone = self:get_node(zone)
end
return M

View File

@ -58,6 +58,13 @@ M.SIDE = {
Y = "y" Y = "y"
} }
M.SWIPE = {
UP = "up",
DOWN = "down",
LEFT = "left",
RIGHT = "right",
}
M.EMPTY_FUNCTION = function() end M.EMPTY_FUNCTION = function() end
M.EMPTY_STRING = "" M.EMPTY_STRING = ""

View File

@ -75,4 +75,11 @@ M["checkbox"] = {
} }
M["swipe"] = {
SWIPE_THRESHOLD = 50,
SWIPE_TIME = 0.4,
SWIPE_TRIGGER_ON_MOVE = true
}
return M return M

View File

@ -15,6 +15,7 @@
-- @see druid.checkbox -- @see druid.checkbox
-- @see druid.checkbox_group -- @see druid.checkbox_group
-- @see druid.radio_group -- @see druid.radio_group
-- @see druid.swipe
local const = require("druid.const") local const = require("druid.const")
local druid_input = require("druid.helper.druid_input") local druid_input = require("druid.helper.druid_input")
@ -36,6 +37,7 @@ local checkbox = require("druid.base.checkbox")
local checkbox_group = require("druid.base.checkbox_group") local checkbox_group = require("druid.base.checkbox_group")
local radio_group = require("druid.base.radio_group") local radio_group = require("druid.base.radio_group")
local input = require("druid.base.input") local input = require("druid.base.input")
local swipe = require("druid.base.swipe")
-- local infinity_scroll = require("druid.base.infinity_scroll") -- local infinity_scroll = require("druid.base.infinity_scroll")
-- @classmod Druid -- @classmod Druid
@ -364,4 +366,13 @@ function Druid.new_radio_group(self, ...)
end end
--- Create swipe basic component
-- @function druid:new_swipe
-- @tparam args ... swipe init args
-- @treturn Component swipe component
function Druid.new_swipe(self, ...)
return Druid.create(self, swipe, ...)
end
return Druid return Druid

View File

@ -33,8 +33,8 @@ nodes {
w: 1.0 w: 1.0
} }
size { size {
x: 1.0 x: 600.0
y: 1.0 y: 900.0
z: 0.0 z: 0.0
w: 1.0 w: 1.0
} }
@ -65,7 +65,7 @@ nodes {
clipping_inverted: false clipping_inverted: false
alpha: 1.0 alpha: 1.0
template_node_child: false template_node_child: false
size_mode: SIZE_MODE_AUTO size_mode: SIZE_MODE_MANUAL
} }
nodes { nodes {
position { position {

View File

@ -39,11 +39,24 @@ local function init_top_panel(self)
end end
local function init_swipe_control(self)
self.druid:new_swipe("root", function(_, side)
if side == "left" then
on_control_button(self, 1)
end
if side == "right" then
on_control_button(self, -1)
end
end)
end
function init(self) function init(self)
druid.set_default_style(default_style) druid.set_default_style(default_style)
self.druid = druid.new(self) self.druid = druid.new(self)
init_top_panel(self) init_top_panel(self)
init_swipe_control(self)
self.page = 1 self.page = 1
main_page.setup_page(self) main_page.setup_page(self)
text_page.setup_page(self) text_page.setup_page(self)

View File

@ -106,7 +106,6 @@ local function setup_back_handler(self)
end end
function M.setup_page(self) function M.setup_page(self)
setup_texts(self) setup_texts(self)