Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-06-27 10:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solve #188 Add drag component total_x/total_y

Browse Source
This commit is contained in:
Insality 2022-06-15 10:34:19 +05:00
parent 415869e2bf
commit c9f862ac03
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
druid/base/drag.lua
View File

@ -17,10 +17,10 @@
--- Event on drag start callback(self) --- Event on drag start callback(self)
-- @tfield DruidEvent on_drag_start @{DruidEvent} -- @tfield DruidEvent on_drag_start @{DruidEvent}
--- on drag progress callback(self, dx, dy) --- on drag progress callback(self, dx, dy, total_x, total_y)
-- @tfield DruidEvent on_drag Event @{DruidEvent} -- @tfield DruidEvent on_drag Event @{DruidEvent}
--- Event on drag end callback(self) --- Event on drag end callback(self, total_x, total_y)
-- @tfield DruidEvent on_drag_end @{DruidEvent} -- @tfield DruidEvent on_drag_end @{DruidEvent}
--- Is component now touching --- Is component now touching
@ -70,7 +70,7 @@ end
local function end_touch(self) local function end_touch(self)
if self.is_drag then if self.is_drag then
self.on_drag_end:trigger(self:get_context()) self.on_drag_end:trigger(self:get_context(), self.x - self.touch_start_pos.x, self.y - self.touch_start_pos.y)
end end
self.is_drag = false self.is_drag = false
@ -96,7 +96,7 @@ local function process_touch(self, touch)
if not self.is_drag and distance >= self.style.DRAG_DEADZONE then if not self.is_drag and distance >= self.style.DRAG_DEADZONE then
self.is_drag = true self.is_drag = true
self.on_drag_start:trigger(self:get_context()) self.on_drag_start:trigger(self:get_context())
self:set_input_priority(const.PRIORITY_INPUT_MAX) self:set_input_priority(const.PRIORITY_INPUT_MAX, true)
end end
end end
@ -267,8 +267,8 @@ function Drag.on_input(self, action_id, action)
local touch_modified = find_touch(action_id, action, self.touch_id) local touch_modified = find_touch(action_id, action, self.touch_id)
if touch_modified and self.is_drag then if touch_modified and self.is_drag then
self.dx = (touch_modified.x - self.x) * self._x_koef self.dx = touch_modified.x - self.x
self.dy = (touch_modified.y - self.y) * self._y_koef self.dy = touch_modified.y - self.y
end end
if touch_modified then if touch_modified then
@ -277,7 +277,7 @@ function Drag.on_input(self, action_id, action)
end end
if self.is_drag then if self.is_drag then
self.on_drag:trigger(self:get_context(), self.dx, self.dy) self.on_drag:trigger(self:get_context(), self.dx, self.dy, self.x - self.touch_start_pos.x, self.y - self.touch_start_pos.y)
end end
return self.is_drag return self.is_drag

1
druid/helper.lua
View File

@ -8,6 +8,7 @@ local const = require("druid.const")
local M = {} local M = {}
--- Text node or icon node can be nil --- Text node or icon node can be nil
local function get_text_width(text_node) local function get_text_width(text_node)
if text_node then if text_node then