mirror of
https://github.com/Insality/druid.git
synced 2025-06-27 18:37:44 +02:00
fix: don't cancel gui.animate on touch pressed. It leads to some problems. Inert scroll still can be stopped by touch
This commit is contained in:
parent
80e2392d24
commit
33c36f4967
@ -266,7 +266,6 @@ function M.on_input(self, action_id, action)
|
|||||||
|
|
||||||
if gui.pick_node(self.input_zone, action.x, action.y) then
|
if gui.pick_node(self.input_zone, action.x, action.y) then
|
||||||
if action.pressed then
|
if action.pressed then
|
||||||
cancel_animate(self)
|
|
||||||
inp.touch = true
|
inp.touch = true
|
||||||
inp.start_x = action.x
|
inp.start_x = action.x
|
||||||
inp.start_y = action.y
|
inp.start_y = action.y
|
||||||
@ -299,8 +298,8 @@ function M.on_input(self, action_id, action)
|
|||||||
|
|
||||||
if action.released then
|
if action.released then
|
||||||
if M.current_scroll == self then
|
if M.current_scroll == self then
|
||||||
inp.touch = false
|
|
||||||
M.current_scroll = nil
|
M.current_scroll = nil
|
||||||
|
inp.touch = false
|
||||||
inp.side = false
|
inp.side = false
|
||||||
result = true
|
result = true
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user