Merge branch 'develop' into 43-infinity-scroll

This commit is contained in:
Insality
2021-04-01 21:14:29 +03:00
26 changed files with 342 additions and 192 deletions

View File

@@ -54,11 +54,10 @@
local Event = require("druid.event")
local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Scroll = component.create("scroll", { const.ON_UPDATE, const.ON_LAYOUT_CHANGE })
local Scroll = component.create("scroll", { component.ON_UPDATE, component.ON_LAYOUT_CHANGE })
local function inverse_lerp(min, max, current)
@@ -414,6 +413,15 @@ function Scroll.bind_grid(self, grid)
end
--- Strict drag scroll area. Useful for
-- restrict events outside stencil node
-- @tparam Drag self
-- @tparam node node Gui node
function Scroll.set_click_zone(self, node)
self.drag:set_click_zone(node)
end
function Scroll._on_scroll_drag(self, dx, dy)
local t = self.target_position
local b = self.available_pos