Partydeck/Druid-Extension
3
0
Fork 0
mirror of https://github.com/Insality/druid synced 2025-09-27 18:12:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 43-infinity-scroll

Browse Source
This commit is contained in:
Insality
2021-04-01 21:14:29 +03:00
parent 8a173305de c5782b5cc2
commit ac7d090cf0
26 changed files with 342 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
druid/base/back_handler.lua
View File

@@ -14,7 +14,7 @@ local Event = require("druid.event")
local const = require("druid.const")
local component = require("druid.component")
local BackHandler = component.create("back_handler", { const.ON_INPUT })
local BackHandler = component.create("back_handler", { component.ON_INPUT })
--- Component init function

2
druid/base/blocker.lua
View File

@@ -10,7 +10,7 @@
local const = require("druid.const")
local component = require("druid.component")
local Blocker = component.create("blocker", { const.ON_INPUT })
local Blocker = component.create("blocker", { component.ON_INPUT })
--- Component init function

2
druid/base/button.lua
View File

@@ -51,7 +51,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Button = component.create("button", { const.ON_INPUT })
local Button = component.create("button", { component.ON_INPUT })
local function is_input_match(self, action_id)

10
druid/base/drag.lua
View File

@@ -48,7 +48,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Drag = component.create("drag", { const.ON_INPUT_HIGH })
local Drag = component.create("drag", { component.ON_INPUT }, const.PRIORITY_INPUT_HIGH)
local function start_touch(self, touch)
@@ -93,7 +93,7 @@ local function process_touch(self, touch)
if not self.is_drag and distance >= self.style.DRAG_DEADZONE then
self.is_drag = true
self.on_drag_start:trigger(self:get_context())
self:increase_input_priority()
self:set_input_priority(const.PRIORITY_INPUT_MAX)
end
end
@@ -265,9 +265,9 @@ end
--- Strict drag click area. Useful for
-- restrict events outside stencil node
-- @tparam Drag self
-- @tparam node zone Gui node
function Drag.set_click_zone(self, zone)
self.click_zone = self:get_node(zone)
-- @tparam node node Gui node
function Drag.set_click_zone(self, node)
self.click_zone = self:get_node(node)
end

2
druid/base/hover.lua
View File

@@ -15,7 +15,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Hover = component.create("hover", { const.ON_INPUT })
local Hover = component.create("hover", { component.ON_INPUT })
--- Component init function

12
druid/base/scroll.lua
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

2
druid/base/static_grid.lua
View File

@@ -46,7 +46,7 @@ local Event = require("druid.event")
local helper = require("druid.helper")
local component = require("druid.component")
local StaticGrid = component.create("static_grid", { const.ON_LAYOUT_CHANGE })
local StaticGrid = component.create("static_grid", { component.ON_LAYOUT_CHANGE })
local function _extend_border(border, pos, size, pivot)

2
druid/base/swipe.lua
View File

@@ -20,7 +20,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Swipe = component.create("swipe", { const.ON_INPUT })
local Swipe = component.create("swipe", { component.ON_INPUT })
local function start_swipe(self, action)

2
druid/base/text.lua
View File

@@ -43,7 +43,7 @@ local Event = require("druid.event")
local const = require("druid.const")
local component = require("druid.component")
local Text = component.create("text", { const.ON_LAYOUT_CHANGE })
local Text = component.create("text", { component.ON_LAYOUT_CHANGE })
local function update_text_size(self)